From d7e6f58eefd6c8eb68c2dcf71928f41ee4935514 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 29 Apr 2025 14:24:44 -0400
Subject: [PATCH 01/64] CASH-313 WIP

---
 .../funnel-header/funnel-header.vue           | 40 ++++++++++++++-----
 .../funnel-header/menu-modal/menu-modal.vue   | 12 +++---
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index bf4f17ec1..8bebb55bd 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -1,13 +1,24 @@
 <template>
-    <div
-        class="funnel-header d-flex justify-content-center align-items-center flex-column"
-        v-if="imageSrc">
+    <div class="funnel-header" v-if="imageSrc">
         <salesforceWebchat hideSalesforceWebchatLaunchButton />
-        <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
-        <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
-        <menuModal />
-        <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
-        <progressBar />
+        <div class="header-column-1 d-flex justify-content-between">
+            <div class="d-flex justify-content-center align-items-center">
+                <button class="salesforce-chat-button"></button>
+            </div>
+            <div class="d-flex justify-content-center align-items-center">
+                <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
+            </div>
+            <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
+            <div class="d-flex justify-content-center align-items-center position-relative">
+                <menuModal />
+            </div>
+            <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
+        </div>
+        <div class="header-column-2">
+            <div class="d-flex w-100 flex-wrap">
+                <progressBar />
+            </div>
+        </div>
     </div>
     <template v-for="globalAlert in globalAlertMessages" :key="globalAlert.id">
         <transition name="fade" mode="out-in">
@@ -101,7 +112,7 @@ export default {
 
 <style lang="scss" scoped>
 :deep(.menu-modal-container) {
-    display: none; // This is temporary until the hamburger menu is re-implemented for use with the progress bar
+    //display: none; // This is temporary until the hamburger menu is re-implemented for use with the progress bar
 }
 .funnel-header {
     position: relative;
@@ -112,4 +123,15 @@ export default {
     width: auto;
     height: 1.1875rem;
 }
+
+.salesforce-chat-button {
+    width: 1.5rem;
+    height: 1.5rem;
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' id='Layer_2' x='0' y='0' style='enable-background:new 0 0 24 24' version='1.1' viewBox='0 0 24 24'%3E%3Cstyle%3E .st0%7Bfill:%232e6fb6%7D %3C/style%3E%3Ccircle cx='12' cy='12' r='12' class='st0'/%3E%3Cpath d='M18.3 12c0 3.5-2.8 6.3-6.3 6.3-1.2 0-2.4-.4-3.4-1l-2.3.7s-.5.1-.3-.4.5-1.7.7-2.2c-.6-1-1-2.1-1-3.3 0-3.5 2.8-6.3 6.3-6.3 3.5-.1 6.3 2.7 6.3 6.2z' style='fill:%23fff'/%3E%3Ccircle cx='10.2' cy='12' r='.6' class='st0'/%3E%3Ccircle cx='12' cy='12' r='.6' class='st0'/%3E%3Ccircle cx='13.8' cy='12' r='.6' class='st0'/%3E%3C/svg%3E");
+    background-repeat: no-repeat;
+    background-size: 1.5rem 1.5rem;
+    background-position: center;
+    border: none;
+    background-color: transparent;
+}
 </style>
diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index 4dc07f3a5..4bb658594 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -11,7 +11,7 @@
             <div class="bar3"></div>
         </button>
     </div>
-    <div class="menu-modal-container">
+    <!-- <div class="menu-modal-container">
         <button
             aria-hidden="true"
             tabindex="-1"
@@ -24,7 +24,7 @@
             <div class="bar2"></div>
             <div class="bar3"></div>
         </button>
-    </div>
+    </div> -->
     <!-- Modal -->
     <div
         class="modal menu-modal fade"
@@ -123,9 +123,9 @@ export default {
 
 <style lang="scss" scoped>
 .menu-modal-container {
-    position: absolute;
-    padding: 1.47rem 0 1.47rem 1.47rem;
-    right: 0;
+    //position: absolute;
+    //padding: 1.47rem 0 1.47rem 1.47rem;
+    //right: 0;
     button {
         border: none;
         &.menu-button {
@@ -164,7 +164,7 @@ export default {
 }
 .modal {
     &.menu-modal {
-        left: auto;
+        //left: auto;
         height: calc(100% - 56px);
         top: 56px;
         border-top: 1px solid $gray-300;

From 8a653eed30c3d9b32a4535f061d20b96c46061ec Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Wed, 30 Apr 2025 20:10:30 +0530
Subject: [PATCH 02/64] CASH-502

remove mobilelocation modal
---
 .../button-functionality-props.js             |   5 +
 .../button-question/button-question.vue       |  13 +-
 .../dropdown-question/dropdown-question.vue   |  10 +
 .../textbox-question/textbox-question.vue     |   9 +
 .../address-questions/address-questions.vue   |  20 +-
 .../appointment-type-question.vue             |   8 +-
 .../mobile-location-modal-questions.spec.js   |  47 +----
 .../mobile-location-modal-questions.vue       | 189 +++++++++---------
 .../vehicle-protected-question.vue            |   8 +-
 .../service-location/service-location.spec.js |  11 +-
 .../service-location/service-location.vue     |  33 ++-
 src/layouts/vin-lookup/vin-lookup.vue         |   2 +-
 src/ux-components/list-button/list-button.vue |   5 +-
 src/ux-components/list-card/list-card.vue     |   8 +-
 14 files changed, 191 insertions(+), 177 deletions(-)

diff --git a/src/digital-components/base-input-button/button-functionality-props.js b/src/digital-components/base-input-button/button-functionality-props.js
index fe2104457..73da5f25c 100644
--- a/src/digital-components/base-input-button/button-functionality-props.js
+++ b/src/digital-components/base-input-button/button-functionality-props.js
@@ -35,4 +35,9 @@ export const inputButtonProps = {
         default: false,
     },
     suppressError: Boolean,
+    labelBold: {
+        type: Boolean,
+        required: false,
+        default: false,
+    },
 };
diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 53f71eb9b..dcf1b18c1 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -9,7 +9,9 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
             v-if="questionText && answers && answers.length > 0"
             class="question-text d-flex"
             :class="{ 'small-question-text': isSmallQuestionText }">
-            <span class="fw-bold w-100">{{ questionText }}</span>
+            <span class="fw-bold w-100" :class="[labelBold ? 'span-bold' : '']">
+                {{ questionText }}
+            </span>
         </div>
 
         <div class="w-100 d-flex justify-content-center">
@@ -57,6 +59,7 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
                             :setLastValuePushedToGa="setLastValuePushedToGa"
                             :isInsuranceSelected="isInsuranceSelected"
                             :suppressError="suppressError"
+                            :labelBold="labelBold"
                             @buttonEvent="handleButtonEvent"
                             v-model="selectedValues" />
                         <!-- For nested questions -->
@@ -141,6 +144,11 @@ export default {
             default: false,
         },
         isInsuranceSelected: Boolean,
+        labelBold: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -360,6 +368,9 @@ export default {
     & > span {
         text-align: center;
     }
+    .span-bold {
+        font-weight: 600;
+    }
 }
 .small-question-text {
     &.question-text {
diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index 8b3cf023f..7b52745fa 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -6,6 +6,7 @@
             :for="dropdownId"
             :aria-label="questionText"
             class="form-label"
+            :class="[labelBold ? 'label-bold' : '']"
             v-html="questionText"></label>
         <select
             v-model="selectedOption"
@@ -61,6 +62,11 @@ export default {
             required: false,
             default: false,
         },
+        labelBold: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
     },
     setup(props) {
         const uuid = uuidv4();
@@ -133,6 +139,10 @@ export default {
         color: $black;
         font-weight: 500;
     }
+    .label-bold {
+        color: $black;
+        font-weight: 600;
+    }
     .form-label {
         margin-bottom: 0.25rem;
     }
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index e6d75fee1..9602daadb 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -13,6 +13,7 @@
             :class="[
                 questionAlignment === 'center' ? 'text-center w-100 mb-5' : '',
                 hideInput ? 'hide-input' : '',
+                labelBold ? 'label-bold' : '',
             ]"
             v-html="questionText"></label>
         <div
@@ -132,6 +133,11 @@ export default {
             isRequired: false,
         },
         autocomplete: String,
+        labelBold: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
     },
     setup(props) {
         const uuid = uuidv4();
@@ -251,6 +257,9 @@ export default {
         color: $black;
         font-weight: 500;
     }
+    .label-bold {
+        font-weight: 600;
+    }
     .input-wrapper {
         position: relative;
         &.has-search-icon {
diff --git a/src/fmg-components/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
index 6256bedd1..4e4cf6b56 100644
--- a/src/fmg-components/address-questions/address-questions.vue
+++ b/src/fmg-components/address-questions/address-questions.vue
@@ -14,7 +14,8 @@
                     hasIcon
                     validationRules="street-address-required"
                     autocomplete="street-address"
-                    @keydown.enter.prevent />
+                    @keydown.enter.prevent
+                    :labelBold="labelBold" />
             </div>
         </div>
         <transition name="fade" mode="out-in">
@@ -27,7 +28,8 @@
                         customInputId="apartmentNumberOrBusinessName"
                         cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
                         v-model="addressModel.apartmentNumberOrBusinessName"
-                        ref="apartmentNumberOrBusinessName" />
+                        ref="apartmentNumberOrBusinessName"
+                        :labelBold="labelBold" />
                 </div>
             </div>
         </transition>
@@ -40,7 +42,8 @@
                         v-model="addressModel.city"
                         ref="city"
                         validationRules="city-required"
-                        autocomplete="address-level2" />
+                        autocomplete="address-level2"
+                        :labelBold="labelBold" />
                 </div>
             </div>
         </transition>
@@ -54,7 +57,8 @@
                         ref="state"
                         :options="stateOptions"
                         validationRules="state-required"
-                        autocomplete="address-level1" />
+                        autocomplete="address-level1"
+                        :labelBold="labelBold" />
                 </div>
                 <div class="col">
                     <textboxQuestion
@@ -64,7 +68,8 @@
                         ref="zipCode"
                         mask="#####"
                         validationRules="zip-code-required|zip-code-format"
-                        autocomplete="postal-code" />
+                        autocomplete="postal-code"
+                        :labelBold="labelBold" />
                 </div>
             </div>
         </transition>
@@ -124,6 +129,11 @@ export default {
             type: Boolean,
             default: false,
         },
+        labelBold: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
     },
     data() {
         return {
diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 64bf159ff..37fdfaf16 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -11,7 +11,8 @@
                 v-model="selectedValue"
                 :suppressError="suppressError"
                 :validationRules="validationRules"
-                isRequired />
+                isRequired
+                :labelBold="labelBold" />
         </div>
     </transition>
 </template>
@@ -33,6 +34,11 @@ export default {
         isServiceableMobile: Boolean,
         isServiceableInshop: Boolean,
         mobileFeeApplies: Boolean,
+        labelBold: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
     },
     computed: {
         questionText() {
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index 3e2873fa1..49d233402 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -189,41 +189,7 @@ describe("mobile-location-modal-questions.vue", () => {
         expect(wrapper.vm.internalModel.serviceZipCode).toEqual("55555");
     });
 
-    it("Should open the modal when the 'Enter your service address' link is clicked", async () => {
-        // Arrange
-        const mobileLocationQuestions = {
-            addressQuestions: {
-                streetAddress: "555 Some St",
-                apartmentNumberOrBusinessName: "Apt 1",
-                city: "Funkytown",
-                state: "OH",
-                zipCode: "55555",
-            },
-            isVehicleProtected: true,
-            serviceZipCode: "55555",
-        };
-
-        const { wrapper } = setupMocks({
-            mixins: [mockMixin],
-            props: {
-                modelValue: mobileLocationQuestions,
-            },
-            mountOptions: {
-                attachTo: document.body,
-            },
-        });
-
-        wrapper.vm.$refs.MobileLocationModalWidget.openModal = jest.fn();
-        const mobileLocationLink = wrapper.findComponent({ ref: "mobileLocationLink" });
-
-        // // Act
-        await mobileLocationLink.trigger("click-event");
-
-        // // Assert
-        expect(wrapper.vm.$refs.MobileLocationModalWidget.openModal).toHaveBeenCalled();
-    });
-
-    it("Should emit setMobileLocationAndProceed on setMobileLocation for a valid address and vehicle protection answer", async () => {
+    it("Should emit setMobileLocation on setMobileLocation for a valid address and vehicle protection answer", async () => {
         // Arrange
         const mobileLocationQuestions = {
             addressQuestions: {
@@ -258,7 +224,6 @@ describe("mobile-location-modal-questions.vue", () => {
             },
             attachTo: document.body,
         });
-        wrapper.vm.$refs.MobileLocationModalWidget.closeModal = jest.fn();
 
         // Act
         wrapper.vm.internalModel = newMobileLocationQuestions;
@@ -266,13 +231,13 @@ describe("mobile-location-modal-questions.vue", () => {
         await wrapper.vm.setMobileLocation();
 
         // Assert
-        expect(wrapper.emitted()["setMobileLocationAndProceed"]).toBeTruthy();
-        expect(wrapper.emitted()["setMobileLocationAndProceed"][0][0]).toStrictEqual(
+        expect(wrapper.emitted()["setMobileLocation"]).toBeTruthy();
+        expect(wrapper.emitted()["setMobileLocation"][0][0]).toStrictEqual(
             newMobileLocationQuestions
         );
     });
 
-    it("Should not emit setMobileLocationAndProceed on setMobileLocation for an invalid address zip code", async () => {
+    it("Should not emit setMobileLocation on setMobileLocation for an invalid address zip code", async () => {
         // Arrange
         const mobileLocationQuestions = {
             addressQuestions: {
@@ -307,15 +272,13 @@ describe("mobile-location-modal-questions.vue", () => {
             },
             attachTo: document.body,
         });
-        wrapper.vm.$refs.MobileLocationModalWidget.closeModal = jest.fn();
-        wrapper.vm.resetModalButtonStyle = jest.fn();
 
         // Act
         wrapper.vm.internalModel = newMobileLocationQuestions;
         await wrapper.vm.setMobileLocation();
 
         // Assert
-        expect(wrapper.emitted("setMobileLocationAndProceed")).not.toBeTruthy();
+        expect(wrapper.emitted("setMobileLocation")).not.toBeTruthy();
     });
 
     it("Should display invalid zip alert for invalid address zip inputs", async () => {
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 0d7a82248..f4764a7d9 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
@@ -14,7 +14,7 @@
                         linkType="text"
                         :text="mobileLocationLinkText"
                         href="#!"
-                        @click-event="openModal" />
+                        @click-event="toggleMobileLocation" />
                 </div>
                 <div v-show="errorMessage" class="row my-1 form-test-error">
                     <span
@@ -30,50 +30,42 @@
                     cmsWidgetName="MobileFeeDisclaimerWidget"
                     typeStyle="caption" />
             </div>
-            <modal
-                :ref="modalName"
-                :headerText="modalHeaderText"
-                :footerButtonText="modalFooterText"
-                :onModalOpenedCallback="onModalOpened"
-                :onModalClosedCallback="onModalClosed"
-                @isModalOpened="setModalStatus"
-                @footer-button-event="setMobileLocation">
-                <template v-if="isModalOpened">
-                    <addressQuestions
-                        ref="addressQuestions"
-                        v-model="internalModel.addressQuestions"
-                        captureApartmentNumberOrBusinessName="true"
-                        preserveCityAndStateOnReset="true" />
-                    <vehicleProtectedQuestion
-                        ref="vehicleProtectedQuestion"
-                        v-model="internalModel.isVehicleProtected"
-                        cmsWidgetName="VehicleProtectedQuestionWidget" />
-                    <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
-                    <alert
-                        ref="alertInvalidZip"
-                        v-if="displayInvalidZipAlert"
-                        class="my-4"
-                        cmsWidgetName="AlertInvalidZipWidget"
-                        alertClass="alert-danger"
-                        v-bind:isDismissible="false" />
-                    <alert
-                        ref="alertMismatchStateAndZip"
-                        v-if="displayMismatchStateAndZipAlert"
-                        class="my-4"
-                        cmsWidgetName="AlertMismatchStateAndZipWidget"
-                        alertClass="alert-danger"
-                        v-bind:isDismissible="false" />
-                </template>
-            </modal>
+            <div v-if="isMobileLocationOpened" class="address-questions-container">
+                <div v-html="headerText" class="HeaderText" />
+                <addressQuestions
+                    ref="addressQuestions"
+                    v-model="internalModel.addressQuestions"
+                    captureApartmentNumberOrBusinessName="true"
+                    preserveCityAndStateOnReset="true"
+                    labelBold="true" />
+                <vehicleProtectedQuestion
+                    ref="vehicleProtectedQuestion"
+                    v-model="internalModel.isVehicleProtected"
+                    cmsWidgetName="VehicleProtectedQuestionWidget"
+                    labelBold="true" />
+                <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
+                <alert
+                    ref="alertInvalidZip"
+                    v-if="displayInvalidZipAlert"
+                    class="my-4"
+                    cmsWidgetName="AlertInvalidZipWidget"
+                    alertClass="alert-danger"
+                    v-bind:isDismissible="false" />
+                <alert
+                    ref="alertMismatchStateAndZip"
+                    v-if="displayMismatchStateAndZipAlert"
+                    class="my-4"
+                    cmsWidgetName="AlertMismatchStateAndZipWidget"
+                    alertClass="alert-danger"
+                    v-bind:isDismissible="false" />
+            </div>
         </div>
     </transition>
 </template>
-
 <script>
 // Components
 import textLink from "@/ux-components/text-link/text-link";
 import textBlock from "@/digital-components/text-block/text-block";
-import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
@@ -98,13 +90,14 @@ export default {
         "updated-mobile-fee-part",
         "updated-contains-military-base",
         "updated-bill-to-account-number",
-        "setMobileLocationAndProceed",
+        "setMobileLocation",
+        "set-mobile-location-invalid",
     ],
     data() {
         return {
             internalModel: deepClone(this.modelValue),
             displayInvalidZipAlert: false,
-            isModalOpened: false,
+            isMobileLocationOpened: false,
             displayMismatchStateAndZipAlert: false,
         };
     },
@@ -199,43 +192,33 @@ export default {
                 this.mobileFeePart.kitPrice
             );
         },
-        modalName() {
-            return "MobileLocationModalWidget";
-        },
-        modalHeaderText() {
+        headerText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
-        modalFooterText() {
-            return this.getCmsContent(this.modalWidgetName, "FooterText");
-        },
-        modal() {
-            return this.$refs[this.modalName];
-        },
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
             },
         },
+        isMobileAddressAvailable: {
+            get: function () {
+                return (
+                    this.addressModel.streetAddress &&
+                    this.addressModel.streetAddress !== "" &&
+                    this.addressModel.city &&
+                    this.addressModel.city !== "" &&
+                    this.addressModel.state &&
+                    this.addressModel.state !== "" &&
+                    this.addressModel.zipCode &&
+                    this.addressModel.zipCode !== "" &&
+                    this.internalModel.isVehicleProtected !== null
+                );
+            },
+        },
     },
     methods: {
-        openModal() {
-            this.modal.openModal();
-        },
-        onModalOpened() {
-            this.internalModel = deepClone(this.modelValue);
-        },
-        setModalStatus(isOpened) {
-            this.isModalOpened = isOpened;
-        },
-        closeModal() {
-            this.modal.closeModal();
-        },
-        onModalClosed() {
-            this.resetAlerts();
-            this.internalModel = deepClone(this.modelValue);
-        },
-        resetModalButtonStyle() {
-            this.modal.resetButtonStyle();
+        setMobileLocationInvalid(isFormInvalid) {
+            this.$emit("set-mobile-location-invalid", isFormInvalid);
         },
         resetAlerts() {
             this.displayInvalidZipAlert = false;
@@ -244,6 +227,10 @@ export default {
         async setMobileLocation() {
             this.resetAlerts();
             // Validate the Zip Code
+            if (this.internalModel.addressQuestions.zipCode === "") {
+                this.setMobileLocationInvalid(true);
+                return;
+            }
             const zipCodeData = await this.getZipCodeData(
                 this.internalModel.addressQuestions.zipCode,
                 "service-location"
@@ -251,11 +238,11 @@ export default {
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
-                this.resetModalButtonStyle();
+                this.setMobileLocationInvalid(true);
                 return;
             } else if (zipCodeData.state != this.internalModel.addressQuestions.state) {
                 this.displayMismatchStateAndZipAlert = true;
-                this.resetModalButtonStyle();
+                this.setMobileLocationInvalid(true);
                 return;
             } else if (
                 this.internalModel.addressQuestions.zipCode !==
@@ -294,27 +281,27 @@ export default {
                 this.$emit("updated-bill-to-account-number", billToAccountNumber);
             }
             // update the page level model
-            this.$emit("setMobileLocationAndProceed", this.internalModel);
+            this.$emit("setMobileLocation", this.internalModel);
+            this.setMobileLocationInvalid(false);
+        },
+        toggleMobileLocation() {
+            this.isMobileLocationOpened = !this.isMobileLocationOpened;
         },
     },
     watch: {
-        modelValue: {
+        internalModel: {
             handler(newValue) {
-                this.internalModel = deepClone(newValue);
                 this.handleChange(newValue);
+                this.setMobileLocation();
             },
             deep: true,
         },
     },
-    unmounted() {
-        if (this.isModalOpened) this.closeModal();
-    },
     components: {
-        textLink,
-        modal,
         addressQuestions,
         vehicleProtectedQuestion,
         textBlock,
+        textLink,
         alert,
     },
 };
@@ -325,28 +312,34 @@ export default {
     .center-error-message {
         justify-content: center !important;
     }
-}
 
-.update-zip-text-link::before {
-    content: "";
-    display: inline-block;
-    width: 13px;
-    height: 16px;
-    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.49635 1.00142e-07C5.64734 -0.000153295 4.80722 0.175918 4.0274 0.517444C3.24757 0.858969 2.54443 1.35877 1.96099 1.98626C0.765713 3.27588 0.0999756 4.98141 0.0999756 6.75394C0.0999756 8.52646 0.765713 10.232 1.96099 11.5216L5.98324 15.777C6.04954 15.8475 6.12918 15.9036 6.21736 15.9419C6.30555 15.9802 6.40045 16 6.49635 16C6.59225 16 6.68716 15.9802 6.77534 15.9419C6.86353 15.9036 6.94317 15.8475 7.00946 15.777L11.0317 11.52C12.2391 10.2383 12.909 8.52914 12.8999 6.75394C12.9094 4.97818 12.2394 3.26832 11.0317 1.98626C10.4481 1.35899 9.74493 0.859347 8.96514 0.517839C8.18535 0.176331 7.34532 0.000130509 6.49635 1.00142e-07V1.00142e-07ZM6.49635 9.13131C6.02507 9.13131 5.56437 8.98913 5.17251 8.72275C4.78065 8.45637 4.47524 8.07776 4.29488 7.63479C4.11453 7.19181 4.06734 6.70438 4.15928 6.23412C4.25123 5.76387 4.47817 5.33191 4.81142 4.99287C5.14467 4.65384 5.56925 4.42295 6.03148 4.32941C6.49371 4.23587 6.97282 4.28388 7.40823 4.46736C7.84364 4.65085 8.21579 4.96157 8.47762 5.36023C8.73945 5.7589 8.87921 6.2276 8.87921 6.70707C8.87921 7.34974 8.62837 7.96611 8.18185 8.4207C7.73532 8.87528 7.12964 9.13088 6.49794 9.13131H6.49635Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
-    background-size: contain;
-    vertical-align: middle;
-    margin-right: 0.5em;
-}
+    .update-zip-text-link::before {
+        content: "";
+        display: inline-block;
+        width: 13px;
+        height: 16px;
+        background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.49635 1.00142e-07C5.64734 -0.000153295 4.80722 0.175918 4.0274 0.517444C3.24757 0.858969 2.54443 1.35877 1.96099 1.98626C0.765713 3.27588 0.0999756 4.98141 0.0999756 6.75394C0.0999756 8.52646 0.765713 10.232 1.96099 11.5216L5.98324 15.777C6.04954 15.8475 6.12918 15.9036 6.21736 15.9419C6.30555 15.9802 6.40045 16 6.49635 16C6.59225 16 6.68716 15.9802 6.77534 15.9419C6.86353 15.9036 6.94317 15.8475 7.00946 15.777L11.0317 11.52C12.2391 10.2383 12.909 8.52914 12.8999 6.75394C12.9094 4.97818 12.2394 3.26832 11.0317 1.98626C10.4481 1.35899 9.74493 0.859347 8.96514 0.517839C8.18535 0.176331 7.34532 0.000130509 6.49635 1.00142e-07V1.00142e-07ZM6.49635 9.13131C6.02507 9.13131 5.56437 8.98913 5.17251 8.72275C4.78065 8.45637 4.47524 8.07776 4.29488 7.63479C4.11453 7.19181 4.06734 6.70438 4.15928 6.23412C4.25123 5.76387 4.47817 5.33191 4.81142 4.99287C5.14467 4.65384 5.56925 4.42295 6.03148 4.32941C6.49371 4.23587 6.97282 4.28388 7.40823 4.46736C7.84364 4.65085 8.21579 4.96157 8.47762 5.36023C8.73945 5.7589 8.87921 6.2276 8.87921 6.70707C8.87921 7.34974 8.62837 7.96611 8.18185 8.4207C7.73532 8.87528 7.12964 9.13088 6.49794 9.13131H6.49635Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+        background-size: contain;
+        vertical-align: middle;
+        margin-right: 0.5em;
+    }
 
-.address-questions {
-    margin-top: 0em;
-}
+    .update-mobile-location-text-link {
+        white-space: pre-line;
+    }
+    .address-questions-container {
+        margin-top: 1rem;
+    }
 
-.update-mobile-location-text-link {
-    white-space: pre-line;
-}
-
-.text-black {
-    color: $black;
+    .text-black {
+        color: $black;
+    }
+    .HeaderText {
+        font-size: 1rem;
+        font-weight: 600;
+        line-height: 1.625rem;
+        color: $black;
+        text-align: center;
+    }
 }
 </style>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index c1484500b..ce0f7ed53 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -7,7 +7,8 @@
         textPosition="text-center"
         v-model="selectedValue"
         validationRules="option-required"
-        isRequired />
+        isRequired
+        :labelBold="labelBold" />
 </template>
 
 <script>
@@ -27,6 +28,11 @@ export default {
             isVehicleProtected: Boolean,
         },
         cmsWidgetName: String,
+        labelBold: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
     },
     components: {
         buttonQuestion,
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 7dccc1b1e..9e9b0eefb 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -470,12 +470,12 @@ describe("service-location.vue", () => {
                 isVehicleProtected: true,
             };
 
-            wrapper.vm.closeModalAction = jest.fn();
+            //wrapper.vm.closeModalAction = jest.fn();
             // Act
 
             // Trigger the event
             await mobileLocationQuestionsComponent.vm.$emit(
-                "setMobileLocationAndProceed",
+                "setMobileLocation",
                 newMobileLocationQuestions
             );
 
@@ -550,7 +550,7 @@ describe("service-location.vue", () => {
 
             // Trigger the event
             await mobileLocationQuestionsComponent.vm.$emit(
-                "setMobileLocationAndProceed",
+                "setMobileLocation",
                 newMobileLocationQuestions
             );
 
@@ -597,10 +597,7 @@ describe("service-location.vue", () => {
 
             wrapper.vm.closeModalAction = jest.fn();
             // Act
-            mobileLocationQuestionsComponent.vm.$emit(
-                "setMobileLocationAndProceed",
-                mobileLocationQuestions
-            );
+            mobileLocationQuestionsComponent.vm.$emit("setMobileLocation", mobileLocationQuestions);
 
             // Assert
             expect(wrapper.vm.selectedAppointmentType).toStrictEqual("Mobile");
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index a85a5bd17..232c03057 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -81,7 +81,8 @@
                         ref="appointmentTypeQuestion"
                         groupName="appointmentTypeQuestion"
                         cmsWidgetName="AppointmentTypeQuestionWidget"
-                        validationRules="option-required" />
+                        validationRules="option-required"
+                        labelBold="true" />
                 </div>
             </div>
             <div class="row justify-content-center">
@@ -101,7 +102,8 @@
                         ref="mobileLocationQuestions"
                         linkWidgetName="MobileLocationLinkWidget"
                         modalWidgetName="MobileLocationModalWidget"
-                        @setMobileLocationAndProceed="setMobileLocationQuestions" />
+                        @setMobileLocation="setMobileLocationQuestions"
+                        @set-mobile-location-invalid="setMobileLocationInValid" />
 
                     <shopQuestion
                         ref="shopQuestion"
@@ -117,7 +119,7 @@
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
-                        :isForwardActionDisabled="!meta.valid || displayNoShopsAlert"
+                        :isForwardActionDisabled="!meta.valid || isForwardActionDisabled"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -207,6 +209,7 @@ export default {
             billToAccountNumber: null,
             shopProviderData: null,
             navigatingForward: false,
+            isMobileAddressValid: true,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -403,6 +406,9 @@ export default {
         isNoComp() {
             return store.getters.order.policy.isNoComp;
         },
+        isForwardActionDisabled() {
+            return this.displayNoShopsAlert || !this.isMobileAddressValid;
+        },
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -505,10 +511,7 @@ export default {
             }
             if (this.isServiceableMobile) {
                 this.setMobileLocation(newValue);
-                //proceed to next page
-                this.forwardButtonAction();
             } else {
-                this.closeModalAction("mobileLocationQuestions");
                 await getZipCodeData(newZipCode).then((zipCodeData) => {
                     this.serviceZipCodeQuestion = {
                         state: zipCodeData.state,
@@ -673,7 +676,7 @@ export default {
         },
         async forwardButtonAction() {
             this.navigatingForward = true;
-
+            var ctu = this.zipCodeCtu;
             if (
                 this.selectedAppointmentType == AppointmentTypeStrings.MOBILE &&
                 this.selectedProvider &&
@@ -684,18 +687,13 @@ export default {
                 this.selectedProvider.address.state = null;
                 this.selectedProvider.address.zipCode = null;
                 this.selectedProvider.address.zipCodeCtu = null;
-            }
-
-            var ctu = this.zipCodeCtu;
-            if (this.selectedAppointmentType == AppointmentTypeStrings.IN_SHOP) {
+            } else {
                 // if we have a provider.zipCodeCtu that's different than the servicelocation.zipCodeCtu then they
                 // may have selected a shop in a different ctu.  change the servicelocation zip/ctu if different
                 if (this.zipCodeCtu != this.selectedProvider.address.zipCodeCtu) {
                     ctu = this.selectedProvider.address.zipCodeCtu;
                 }
-
-                this.city = null;
-                this.streetAddress = null;
+                this.resetMobileLocation();
             }
 
             await this.dispatchStoreAction(
@@ -735,11 +733,8 @@ export default {
             this.updateAndSaveIsMSRFeeApplicable();
             this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
         },
-        openModalAction(modalName) {
-            this.$refs[modalName].openModal();
-        },
-        closeModalAction(modalName) {
-            this.$refs[modalName].closeModal();
+        setMobileLocationInValid(isMobileLocationInValid) {
+            this.isMobileAddressValid = !isMobileLocationInValid;
         },
     },
     watch: {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 1b57ee068..fbab8eeae 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -341,7 +341,7 @@ export default {
                     false
                 );
                 if (this.isHeavyTruck) {
-                    closestShops = await this.findClosestApplicableShops(
+                    var closestShops = await this.findClosestApplicableShops(
                         this.serviceZipCode,
                         this.carId
                     );
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index d31f20e5d..fa06970ac 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -6,7 +6,7 @@
         <div
             :aria-label="buttonLabel"
             class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4 p-md-4">
-            <span class="m-0" :class="textPosition">
+            <span class="m-0" :class="[textPosition, labelBold ? 'span-bold' : '']">
                 {{ buttonLabel }}
             </span>
             <span v-if="buttonLabelSubCopy" class="m-0 small" :class="textPosition">
@@ -88,6 +88,9 @@ export default {
         &:checked + .list-button-content span {
             font-weight: 500;
         }
+        &:checked + .list-button-content .span-bold {
+            font-weight: 600;
+        }
         &:checked + .list-button-content span:nth-child(2) {
             font-weight: 400;
             color: $gray-600;
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 56cb1482e..d03be4675 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -15,7 +15,10 @@
                 :class="!isWide ? 'order-1' : 'ms-auto order-3'"
                 :src="buttonImage"
                 :alt="altText" />
-            <p v-if="!isWide" class="small order-3" :class="isMultiSelect ? 'm-0' : 'mt-2 mb-0'">
+            <p
+                v-if="!isWide"
+                class="small order-3"
+                :class="[isMultiSelect ? 'm-0' : 'mt-2 mb-0', labelBold ? 'p-bold' : '']">
                 {{ buttonLabel }}
             </p>
             <p v-if="buttonLabelSubCopy && !isWide" class="fs-7 m-0 order-4 sub-copy">
@@ -122,6 +125,9 @@ export default {
                 color: $black;
                 font-weight: 500;
             }
+            .p-bold {
+                font-weight: 600;
+            }
 
             .sub-copy {
                 color: $gray-600;

From 5f5ca81c1f314c2c59fb01fdef0d95d93b47aec9 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 30 Apr 2025 14:02:29 -0400
Subject: [PATCH 03/64] CASH-313 chat styles and refactor funnel-header.

---
 .../salesforce-webchat/salesforce-webchat.vue | 26 +++++++--
 .../funnel-header/funnel-header.vue           | 55 ++++++++-----------
 .../funnel-header/menu-modal/menu-modal.vue   | 18 ------
 3 files changed, 44 insertions(+), 55 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 9283bda62..ac7f8c505 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -1,5 +1,7 @@
 <template>
-    <span class="salesforce-webchat"></span>
+    <span class="salesforce-webchat">
+        <button v-show="hideSalesforceWebchatLaunchButton" class="salesforce-chat-button"></button>
+    </span>
 </template>
 
 <script>
@@ -50,11 +52,23 @@ export default {
 </script>
 
 <style type="text/css">
-.embeddedServiceHelpButton .helpButton .uiButton {
-    background-color: #167cac;
-    font-family: "Arial", sans-serif;
+.salesforce-webchat {
+    .salesforce-chat-button {
+        width: 1.5rem;
+        height: 1.5rem;
+        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' id='Layer_2' x='0' y='0' style='enable-background:new 0 0 24 24' version='1.1' viewBox='0 0 24 24'%3E%3Cstyle%3E .st0%7Bfill:%232e6fb6%7D %3C/style%3E%3Ccircle cx='12' cy='12' r='12' class='st0'/%3E%3Cpath d='M18.3 12c0 3.5-2.8 6.3-6.3 6.3-1.2 0-2.4-.4-3.4-1l-2.3.7s-.5.1-.3-.4.5-1.7.7-2.2c-.6-1-1-2.1-1-3.3 0-3.5 2.8-6.3 6.3-6.3 3.5-.1 6.3 2.7 6.3 6.2z' style='fill:%23fff'/%3E%3Ccircle cx='10.2' cy='12' r='.6' class='st0'/%3E%3Ccircle cx='12' cy='12' r='.6' class='st0'/%3E%3Ccircle cx='13.8' cy='12' r='.6' class='st0'/%3E%3C/svg%3E");
+        background-repeat: no-repeat;
+        background-size: 1.5rem 1.5rem;
+        background-position: center;
+        border: none;
+        background-color: transparent;
+    }
+    .embeddedServiceHelpButton .helpButton .uiButton {
+        background-color: #167cac;
+        font-family: "Arial", sans-serif;
 }
-.embeddedServiceHelpButton .helpButton .uiButton:focus {
-    outline: 1px solid #167cac;
+    .embeddedServiceHelpButton .helpButton .uiButton:focus {
+        outline: 1px solid #167cac;
+    }
 }
 </style>
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 8bebb55bd..c78339e38 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -1,23 +1,20 @@
 <template>
     <div class="funnel-header" v-if="imageSrc">
-        <salesforceWebchat hideSalesforceWebchatLaunchButton />
-        <div class="header-column-1 d-flex justify-content-between">
-            <div class="d-flex justify-content-center align-items-center">
-                <button class="salesforce-chat-button"></button>
+        <div class="d-flex justify-content-between align-items-center">
+            <div class="button-container">
+                <salesforceWebchat hideSalesforceWebchatLaunchButton />
             </div>
-            <div class="d-flex justify-content-center align-items-center">
+            <div class="site-logo">
                 <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
             </div>
-            <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
-            <div class="d-flex justify-content-center align-items-center position-relative">
+            <div class="button-container">
+                <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
                 <menuModal />
+                <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
             </div>
-            <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
         </div>
-        <div class="header-column-2">
-            <div class="d-flex w-100 flex-wrap">
-                <progressBar />
-            </div>
+        <div class="d-flex w-100">
+            <progressBar />
         </div>
     </div>
     <template v-for="globalAlert in globalAlertMessages" :key="globalAlert.id">
@@ -56,7 +53,7 @@ export default {
         cmsWidgetName: String,
         hideSalesforceWebchatLaunchButton: {
             type: Boolean,
-            default: false,
+            default: true,
         },
     },
     computed: {
@@ -111,27 +108,23 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-:deep(.menu-modal-container) {
-    //display: none; // This is temporary until the hamburger menu is re-implemented for use with the progress bar
-}
 .funnel-header {
     position: relative;
-    padding: 0.97rem 0;
-}
+    padding: 1rem 0;
 
-.logo-image {
-    width: auto;
-    height: 1.1875rem;
-}
+    .button-container {
+        width: 1.5rem;
+        height: 1.625rem;
+    }
 
-.salesforce-chat-button {
-    width: 1.5rem;
-    height: 1.5rem;
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' id='Layer_2' x='0' y='0' style='enable-background:new 0 0 24 24' version='1.1' viewBox='0 0 24 24'%3E%3Cstyle%3E .st0%7Bfill:%232e6fb6%7D %3C/style%3E%3Ccircle cx='12' cy='12' r='12' class='st0'/%3E%3Cpath d='M18.3 12c0 3.5-2.8 6.3-6.3 6.3-1.2 0-2.4-.4-3.4-1l-2.3.7s-.5.1-.3-.4.5-1.7.7-2.2c-.6-1-1-2.1-1-3.3 0-3.5 2.8-6.3 6.3-6.3 3.5-.1 6.3 2.7 6.3 6.2z' style='fill:%23fff'/%3E%3Ccircle cx='10.2' cy='12' r='.6' class='st0'/%3E%3Ccircle cx='12' cy='12' r='.6' class='st0'/%3E%3Ccircle cx='13.8' cy='12' r='.6' class='st0'/%3E%3C/svg%3E");
-    background-repeat: no-repeat;
-    background-size: 1.5rem 1.5rem;
-    background-position: center;
-    border: none;
-    background-color: transparent;
+    .logo-image {
+        width: auto;
+        height: 1.1875rem;
+        margin: 0 auto;
+    }
+
+    :deep(.menu-modal-container) {
+        display: none; // This is temporary until the hamburger menu is re-implemented for use with the progress bar
+    }
 }
 </style>
diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index 4bb658594..8f68ab6e9 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -11,21 +11,6 @@
             <div class="bar3"></div>
         </button>
     </div>
-    <!-- <div class="menu-modal-container">
-        <button
-            aria-hidden="true"
-            tabindex="-1"
-            class="menu-button"
-            type="button"
-            :class="[isActive ? 'active' : '']"
-            @click="toggleModal"
-            aria-label="Hamburger Menu (modal window)">
-            <div class="bar1"></div>
-            <div class="bar2"></div>
-            <div class="bar3"></div>
-        </button>
-    </div> -->
-    <!-- Modal -->
     <div
         class="modal menu-modal fade"
         data-bs-backdrop="false"
@@ -123,9 +108,6 @@ export default {
 
 <style lang="scss" scoped>
 .menu-modal-container {
-    //position: absolute;
-    //padding: 1.47rem 0 1.47rem 1.47rem;
-    //right: 0;
     button {
         border: none;
         &.menu-button {

From 68e49b26bbfcea749226a4844ccb60223953529d Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 1 May 2025 16:06:29 -0400
Subject: [PATCH 04/64] CASH-313 salesforce chat WIP

---
 .../salesforce-webchat/salesforce-webchat.vue | 62 ++++++++++++++++---
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index ac7f8c505..f71b8ae90 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -35,14 +35,14 @@ export default {
                 case "Prod":
                     initializeSalesforceWebchatForProd();
                     break;
-                case "QA":
+                case "Localhost":
                 case "SysTest":
                     initializeSalesforceWebchatForQa();
                     break;
                 case "Dev":
-                case "Localhost":
-                    initializeSalesforceWebchatForDev();
-                    break;
+                // case "Localhost":
+                //     initializeSalesforceWebchatForDev();
+                //     break;
             }
         },
     },
@@ -63,12 +63,54 @@ export default {
         border: none;
         background-color: transparent;
     }
-    .embeddedServiceHelpButton .helpButton .uiButton {
-        background-color: #167cac;
-        font-family: "Arial", sans-serif;
 }
-    .embeddedServiceHelpButton .helpButton .uiButton:focus {
-        outline: 1px solid #167cac;
-    }
+
+/* .embeddedServiceHelpButton .helpButton .uiButton {
+    background-color: red;
+    font-family: "Arial", sans-serif;
 }
+.embeddedServiceHelpButton .helpButton .uiButton:focus {
+    outline: 1px solid #167cac;
+} */
+
+.embeddedServiceHelpButton .helpButton .uiButton {
+    background-color: #0070d1!important;
+}
+
+.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar .embeddedServiceSidebarMinimizedDefaultUI.helpButton,
+.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar .sidebarHeader.minimizedContainer.embeddedServiceSidebarMinimizedDefaultUI {
+    background-color: #0070d1;
+    border: 1px solid #0070d1;
+}
+
+.dockableContainer.showDockableContainer .chatHeaderBranding,
+.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceLiveAgentStateChatAvatar.isLightningOutContext .agentIconColor0 {
+    background-color: #0070d1;
+}
+
+.dockableContainer.showDockableContainer,
+.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceSidebarFormField .uiInput .uiLabel-left {
+    font-family: AvertaRegular;
+    color: #727676;
+}
+
+.dockableContainer.showDockableContainer span.required,
+.dockableContainer.showDockableContainer .sidebarBody .form-element__help {
+    color: #db0020;
+}
+
+.dockableContainer.showDockableContainer .sidebarBody button {
+    background: linear-gradient(270deg, #0070d1 0%, #003d58 100%);
+    color: #fff;
+}
+
+.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceSidebarFormField .uiInput input {
+    border: 1px solid #8e9292;
+}
+
+.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceSidebarButton.uiButton--inverse .label {
+    color: #fff;
+    text-decoration: underline;
+}
+ 
 </style>

From 61a975a71597c8fafa051683d988a643b85a8cc9 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 5 May 2025 10:04:55 -0400
Subject: [PATCH 05/64] CASH-313 chat styling.

---
 .../salesforce-webchat/salesforce-webchat.vue | 82 ++++++++++++-------
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index f71b8ae90..be58896de 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -51,7 +51,7 @@ export default {
 };
 </script>
 
-<style type="text/css">
+<style lang="scss">
 .salesforce-webchat {
     .salesforce-chat-button {
         width: 1.5rem;
@@ -65,52 +65,78 @@ export default {
     }
 }
 
-/* .embeddedServiceHelpButton .helpButton .uiButton {
-    background-color: red;
-    font-family: "Arial", sans-serif;
+.dockableContainer.showDockableContainer .sidebarBody {
+    button {
+        background: #0070d1;
+        color: #fff;
+        &:hover {
+            background: #06577c!important;
+        }
+    }
+    .embeddedServiceSidebarFormField .uiInput input {
+        border: 1px solid #8e9292;
+    }
+    .embeddedServiceSidebarButton.uiButton--inverse .label {
+        color: #fff;
+        text-decoration: underline;
+    }
+    .embeddedServiceLiveAgentStateChatAvatar.isLightningOutContext .agentIconColor0 {
+        background-color: #0070d1;
+    }
+    .embeddedServiceSidebarFormField .uiInput .uiLabel-left {
+        font-family: AvertaRegular;
+        color: #727676;
+    }
+    .form-element__help {
+        color: #db0020;
+    }
+    .embeddedServiceSidebarFormField .uiInput input {
+        border: 1px solid #06577c;
+    }
+    .embeddedServiceLiveAgentStateChatInputFooter
+        .footerMenuWrapper
+        .footer-menu-items
+        .slds-dropdown__item
+        > a {
+        padding-left: 0;
+        max-width: 100%;
+        display: flex;
+        justify-content: center;
+    }
+    .embeddedServiceLiveAgentStateChatInputFooter .footerMenuWrapper .footer-menu-items a {
+        margin: 0 auto;
+    }
+    .embeddedServiceSidebarButton.uiButton--inverse:not(:disabled):focus {
+        background-color: #0070d1;
+    }
 }
-.embeddedServiceHelpButton .helpButton .uiButton:focus {
-    outline: 1px solid #167cac;
-} */
 
 .embeddedServiceHelpButton .helpButton .uiButton {
-    background-color: #0070d1!important;
+    background-color: #0070d1 !important;
 }
 
-.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar .embeddedServiceSidebarMinimizedDefaultUI.helpButton,
-.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar .sidebarHeader.minimizedContainer.embeddedServiceSidebarMinimizedDefaultUI {
+.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar
+    .embeddedServiceSidebarMinimizedDefaultUI.helpButton,
+.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar
+    .sidebarHeader.minimizedContainer.embeddedServiceSidebarMinimizedDefaultUI {
     background-color: #0070d1;
     border: 1px solid #0070d1;
 }
 
-.dockableContainer.showDockableContainer .chatHeaderBranding,
-.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceLiveAgentStateChatAvatar.isLightningOutContext .agentIconColor0 {
+.dockableContainer.showDockableContainer .chatHeaderBranding {
     background-color: #0070d1;
 }
 
-.dockableContainer.showDockableContainer,
-.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceSidebarFormField .uiInput .uiLabel-left {
+.dockableContainer.showDockableContainer {
     font-family: AvertaRegular;
     color: #727676;
 }
 
-.dockableContainer.showDockableContainer span.required,
-.dockableContainer.showDockableContainer .sidebarBody .form-element__help {
+.dockableContainer.showDockableContainer span.required {
     color: #db0020;
 }
 
-.dockableContainer.showDockableContainer .sidebarBody button {
-    background: linear-gradient(270deg, #0070d1 0%, #003d58 100%);
-    color: #fff;
-}
+.dockableContainer.showDockableContainer .sidebarBody button:hover {
 
-.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceSidebarFormField .uiInput input {
-    border: 1px solid #8e9292;
 }
-
-.dockableContainer.showDockableContainer .sidebarBody .embeddedServiceSidebarButton.uiButton--inverse .label {
-    color: #fff;
-    text-decoration: underline;
-}
- 
 </style>

From 78b760ea01268586897bb3de9512ccb552ca498a Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 5 May 2025 14:43:21 -0400
Subject: [PATCH 06/64] CASH-313 change environments back.

---
 .../salesforce-webchat/salesforce-webchat.vue         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index be58896de..975c639a8 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -35,14 +35,14 @@ export default {
                 case "Prod":
                     initializeSalesforceWebchatForProd();
                     break;
-                case "Localhost":
+                case "QA":
                 case "SysTest":
                     initializeSalesforceWebchatForQa();
                     break;
                 case "Dev":
-                // case "Localhost":
-                //     initializeSalesforceWebchatForDev();
-                //     break;
+                case "Localhost":
+                    initializeSalesforceWebchatForDev();
+                    break;
             }
         },
     },
@@ -70,7 +70,7 @@ export default {
         background: #0070d1;
         color: #fff;
         &:hover {
-            background: #06577c!important;
+            background: #06577c !important;
         }
     }
     .embeddedServiceSidebarFormField .uiInput input {
@@ -137,6 +137,5 @@ export default {
 }
 
 .dockableContainer.showDockableContainer .sidebarBody button:hover {
-
 }
 </style>

From 3eae075f6eac6c338838bd76758349be91c3571c Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 6 May 2025 11:47:21 -0400
Subject: [PATCH 07/64] Omnibus

---
 src/App.vue                                   |   3 +
 src/constants/application-config.js           |  19 +-
 src/constants/store-actions.js                |   1 +
 src/constants/store-mutations.js              |   1 +
 .../text-block/text-block.vue                 |   2 +-
 .../progress-bar/progress-bar.vue             |   2 +-
 src/global-methods.js                         |   4 +-
 .../heritage-integration/order-helper.js      |  26 +-
 src/layouts/address-lookup/address-lookup.vue |  17 +-
 .../address-vehicles/address-vehicles.vue     |  11 +-
 src/layouts/bailout/bailout.vue               |   2 +-
 .../capability-questions.vue                  |   2 +-
 src/layouts/confirmation/confirmation.vue     |  15 +-
 .../customer-details/customer-details.vue     |  15 +-
 src/layouts/estimate/estimate.vue             |  22 +-
 .../insurance-company/insurance-company.vue   |  15 +-
 .../license-plate-lookup.vue                  |  16 +-
 .../molding-questions/molding-questions.vue   |   2 +-
 src/layouts/part-questions/part-questions.vue |   2 +-
 src/layouts/payment-method/payment-method.vue |  29 +-
 .../payment-pia-return/payment-pia-return.vue |  47 +-
 src/layouts/payment/payment.vue               |  32 +-
 src/layouts/quote/quote.vue                   |  27 +-
 src/layouts/return-user/return-user.vue       |  10 +-
 src/layouts/schedule/schedule.vue             |  12 +-
 .../service-location/service-location.vue     |   9 +-
 src/layouts/service-zip/service-zip.vue       |  11 +-
 src/layouts/vehicle-damage/vehicle-damage.vue |  37 +-
 .../glass-part-question.vue                   |   2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue   |   2 +-
 src/layouts/vehicle/vehicle.vue               |  15 +-
 src/layouts/vin-lookup/vin-lookup.vue         |  14 +-
 src/main.js                                   |   2 +-
 src/mixins/base-mixin.js                      |   9 +-
 src/mixins/vehicle-questions-mixin.js         |  36 +-
 .../a-rewrite/constants/auto-route-table.js   |  13 +
 .../constants/navigation-scenarios.js         |  69 ++
 .../a-rewrite/constants/route-prefix.js       |   3 +
 src/router/a-rewrite/constants/routes.js      | 123 ++++
 .../a-rewrite/constants/routing-table.js      | 596 ++++++++++++++++++
 src/router/a-rewrite/index.js                 | 421 +++++++++++++
 .../a-rewrite/logic/build-manual-url.js       |  27 +
 .../a-rewrite/logic/consume-referral-info.js  |  18 +
 src/router/a-rewrite/logic/create-route.js    |  39 ++
 src/router/a-rewrite/logic/get-destination.js |  18 +
 .../logic/initialize-from-querystrings.js     | 121 ++++
 .../a-rewrite/logic/lazy-load-component.js    |   3 +
 .../a-rewrite/logic/querystring-stash.js      |  58 ++
 .../logic/requires-verified-redirect.js       |   8 +
 src/router/a-rewrite/logic/run-experiments.js |  30 +
 src/router/a-rewrite/logic/save-page-data.js  |  11 +
 src/store/index.js                            |   8 +
 52 files changed, 1816 insertions(+), 221 deletions(-)
 create mode 100644 src/router/a-rewrite/constants/auto-route-table.js
 create mode 100644 src/router/a-rewrite/constants/navigation-scenarios.js
 create mode 100644 src/router/a-rewrite/constants/route-prefix.js
 create mode 100644 src/router/a-rewrite/constants/routes.js
 create mode 100644 src/router/a-rewrite/constants/routing-table.js
 create mode 100644 src/router/a-rewrite/index.js
 create mode 100644 src/router/a-rewrite/logic/build-manual-url.js
 create mode 100644 src/router/a-rewrite/logic/consume-referral-info.js
 create mode 100644 src/router/a-rewrite/logic/create-route.js
 create mode 100644 src/router/a-rewrite/logic/get-destination.js
 create mode 100644 src/router/a-rewrite/logic/initialize-from-querystrings.js
 create mode 100644 src/router/a-rewrite/logic/lazy-load-component.js
 create mode 100644 src/router/a-rewrite/logic/querystring-stash.js
 create mode 100644 src/router/a-rewrite/logic/requires-verified-redirect.js
 create mode 100644 src/router/a-rewrite/logic/run-experiments.js
 create mode 100644 src/router/a-rewrite/logic/save-page-data.js

diff --git a/src/App.vue b/src/App.vue
index 422ae2893..f4c5754aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,6 +36,9 @@ export default {
         loadingModal,
         funnelFooter,
     },
+    mounted() {
+        showFmgLoadingModal(true);
+    },
 };
 
 // Add a global Javascript exception handler for logging exceptions, this handler will log when there is an uncaught exception
diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 14f195cfc..a03e5f010 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -15,21 +15,12 @@ const applicationConfig = {
     CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER: "87291",
     MY_ACCOUNT: process.env.VUE_APP_MY_ACCOUNT,
     PIA_RESPONSE_URL:
-        location.protocol +
-        "//" +
-        location.host +
-        "/fmg/?fmgPage=payment-pia-return&src=concept-funnel",
+        location.protocol + "//" + location.host + "/fmg/payment-pia-return?src=concept-funnel",
     PIA_CANCEL_URL:
-        location.protocol +
-        "//" +
-        location.host +
-        "/fmg/?fmgPage=payment-method&src=concept-funnel",
+        location.protocol + "//" + location.host + "/fmg/payment-method?src=concept-funnel",
     PIA_ERROR_URL:
-        location.protocol +
-        "//" +
-        location.host +
-        "/fmg/?fmgPage=payment-pia-return&src=concept-funnel",
-    CONFIRMATION_URL: location.protocol + "//" + location.host + "/fmg/?fmgPage=confirmation",
+        location.protocol + "//" + location.host + "/fmg/payment-pia-return?src=concept-funnel",
+    CONFIRMATION_URL: location.protocol + "//" + location.host + "/fmg/confirmation",
     GOOGLE_CALENDAR: "https://www.google.com/calendar/render?action=TEMPLATE",
     YAHOO_CALENDAR: "https://calendar.yahoo.com/?v=60",
     OUTLOOK_CALENDAR:
@@ -38,7 +29,7 @@ const applicationConfig = {
     AFFILIATE_COOKIE_CONTAINING_NAME: "_Track",
     COOKIE_NAME_LENGTH_MAX_LIMIT: 44,
     SESSION_TIMEOUT_MINUTES: process.env.VUE_APP_SESSION_TIMEOUT_MINUTES,
-    RETURN_USER_PAGE: "/fmg/?fmgPage=return-user",
+    RETURN_USER_PAGE: "/fmg/return-user",
 };
 
 export { applicationConfig };
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 7b76d4064..9f0965480 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -117,6 +117,7 @@ const storeActions = {
     UPDATE_EXTERNAL_PARAMETER_MMS: "updateExternalParameterMMS",
 
     SAVE_LOGGING_OPTION: "saveLoggingOption",
+    UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 2f53d8133..a61720e83 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -93,6 +93,7 @@ const storeMutations = {
     UPDATE_SAVE_SESSION_PROMISE: "updateSaveSessionPromise",
     UPDATE_LAST_PAGE_VISITED: "updateLastPageVisited",
     UPDATE_LOGGING_OPTION: "updateLoggingOption",
+    UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
 
     // EXPERIMENT MUTATIONS
     UPDATE_EXPERIMENTS: "updateExperiments",
diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index b84f12283..c7bb61215 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -58,7 +58,7 @@ export default {
         getRouterLinkDisplayTextFromCopy,
         getExternalLink,
         navigateWithScenario(scenarioName) {
-            this.$router.navigateWithoutSaving(scenarioName, this.$route);
+            this.$router.navigateWithoutSaving(scenarioName, this.pageName);
         },
     },
     computed: {
diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index ab6a00b3a..da370e415 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -17,7 +17,7 @@ export default {
     },
     methods: {
         getProgress() {
-            var pageName = store.getters.applicationUser.lastPageVisited;
+            var pageName = this.pageName;
             return getProgressBarPercentage(pageName);
         },
     },
diff --git a/src/global-methods.js b/src/global-methods.js
index ba6cec1ec..784ba6782 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import router from "@/router";
+import router from "@/router/a-rewrite";
 import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
@@ -117,7 +117,7 @@ export default {
                             endpoint: endpoint,
                         };
 
-                        router.navigateError(errorPayload);
+                        router.bailout(errorPayload);
 
                         // do not log 404 errors from services because we return NotFound
                         // when a service doesn't return an object
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 76729e49f..1c0922ba0 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -59,25 +59,15 @@ export async function saveSession({
     submitAfterSave = false,
     createUnscheduledStatusWorkOrderForPIA = false,
 }) {
-    var saveSessionPromise;
-    if (store.getters.applicationUser.saveSessionPromise) {
-        // queue newest request after current saveSessionPromise resolves
-        saveSessionPromise = store.getters.applicationUser.saveSessionPromise.then(() => {
-            // get a new saveSessionPromise
-            return saveSessionHelper(
-                pageNameToLog,
-                submitAfterSave,
-                createUnscheduledStatusWorkOrderForPIA
-            );
-        });
-    } else {
-        // create an initial saveSessionPromise
-        saveSessionPromise = saveSessionHelper(
+    // Add next save session to end of queue
+    const saveSessionPromise = flushSaveSessionQueue().then(() => {
+        return saveSessionHelper(
             pageNameToLog,
             submitAfterSave,
             createUnscheduledStatusWorkOrderForPIA
         );
-    }
+    });
+
     store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise);
     // await here to allow for a caller to await and make the function synchronous
     if (!store.getters.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
@@ -133,7 +123,7 @@ async function loadSession(
     pageNameToLog
 ) {
     // await the saveSessionPromise in the store to make sure we're loading up to date information
-    await store.getters.applicationUser.saveSessionPromise;
+    await flushSaveSessionQueue();
 
     const response = await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.LOAD_SESSION,
@@ -193,3 +183,7 @@ async function saveSessionHelper(
     // Update the cookie with the referral information when saved.
     updateOrCreateFunnelCookie();
 }
+
+export async function flushSaveSessionQueue() {
+    return Promise.resolve(store.getters.applicationUser.saveSessionPromise);
+}
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 54020b7b0..6a82ea26c 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -137,7 +137,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -193,7 +193,10 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
@@ -442,18 +445,14 @@ export default {
             ) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else if (matchingCars.length === 1) {
                 await this.navigateForwardWithSingleCarMatch();
             } else {
-                this.$router.navigateWithSaving(
+                this.$router.navigateWithPageData(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                    this.$route,
-                    {},
-                    {},
+                    this.pageName,
                     carsFound
                 );
             }
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index f44cdc65a..e094f6147 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -82,7 +82,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -166,7 +166,10 @@ export default {
             return false;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             const vinLookup = await this.dispatchStoreActionWithLogging(
@@ -205,9 +208,7 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index b1f159fbe..a64f7a416 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -37,7 +37,7 @@ export default {
     name: "bailout",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 1896513a1..e04f0f18e 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 40736b2c2..e65eacc3c 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -123,6 +123,7 @@ import experimentMixin from "@/mixins/experiment-mixin.js";
 import { containsRecalParts } from "@/helpers/recal-helper.js";
 import donationBlock from "@/experiment-components/donation-block.vue";
 import { partNumberStrings } from "@/constants/part-number-strings";
+import analyticsMixin from "@/mixins/analytics-mixin";
 
 export default {
     name: "confirmation",
@@ -179,7 +180,7 @@ export default {
 
         // Call APIs
         const submittedOrder = baseMixin.methods.getSubmittedOrder();
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_WIPERS,
@@ -244,6 +245,8 @@ export default {
             vm.showDonationSuccess = lineItemsFromSubmittedOrder.supportingItems?.some(
                 (item) => item.partType === partNumberStrings.DONATION
             );
+
+            vm.pushAnalytics();
         });
     },
     data() {
@@ -556,6 +559,16 @@ export default {
                 this.$refs.donationBlock.removeLoader();
             }
         },
+        pushAnalytics() {
+            //Push Ecommerce Cart to Data Layer
+            analyticsMixin.methods.pushECommerceCartToDataLayer();
+
+            //Push Product Array to Data Layer
+            analyticsMixin.methods.pushProductArrayToDataLayer();
+
+            //Push Commission Junction Gtm Data To Data Layer
+            analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
+        },
     },
     components: {
         funnelHeader,
diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue
index baa8636be..8cb17673b 100644
--- a/src/layouts/customer-details/customer-details.vue
+++ b/src/layouts/customer-details/customer-details.vue
@@ -84,6 +84,7 @@ import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import store from "@/store";
 import { paymentMethods } from "@/constants/payment-method-constants";
+import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
@@ -102,7 +103,7 @@ export default {
     name: "customer-details",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -157,7 +158,10 @@ export default {
             return store.getters.order.serviceLocation.techNotes;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             this.dispatchStoreAction(
@@ -186,10 +190,13 @@ export default {
                     paymentMethods.NONE,
                     false
                 );
-                await store.getters.applicationUser.saveSessionPromise;
+                await flushSaveSessionQueue();
             }
 
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
     },
     components: {
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index b9fdf1958..0a5db7d74 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,6 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -89,7 +90,7 @@ export default {
 
     async beforeRouteEnter(to, from, next) {
         //Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const queryString = window.location.search;
         const urlParams = new URLSearchParams(queryString);
@@ -98,9 +99,9 @@ export default {
             lowerCaseParams.append(name.toLowerCase(), value);
         }
 
-        const zip = lowerCaseParams.get(queryStrings.ZIP_CODE)
-            ? lowerCaseParams.get(queryStrings.ZIP_CODE)
-            : store.getters.order.serviceLocation.zipCode;
+        const zip =
+            consumeQueryFromStash(queryStrings.ZIP_CODE) ??
+            store.getters.order.serviceLocation.zipCode;
 
         var vinByAddressPromise;
         if (zip) {
@@ -184,32 +185,35 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.MANUALVIN) {
                 await this.dispatchStoreAction(storeActions.CLEAR_VIN);
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_MANUAL_VIN,
-                    this.$route
+                    this.pageName
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.LICENSEPLATE) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_LICENSE_PLATE,
-                    this.$route
+                    this.pageName
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.HOMEADDRESS) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_HOME_ADDRESS,
-                    this.$route
+                    this.pageName
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.DECLINE) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_NO_VIN,
-                    this.$route
+                    this.pageName
                 );
             }
         },
diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index c9409eb71..7efde9a68 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -58,6 +58,7 @@ import { experimentSettings } from "@/constants/experiments";
 import { partNumberStrings } from "@/constants/part-number-strings";
 import { deepClone } from "@/helpers/object-helper";
 import store from "@/store";
+import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 
 export default {
     name: "insurance-company",
@@ -81,7 +82,7 @@ export default {
         }
 
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         const insuranceCompanyListPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_INSURANCE_COMPANY_LIST,
             {},
@@ -146,18 +147,20 @@ export default {
             // Go back to Quote page
             if (forceCashSelectionOnQuote) {
                 this.$router.navigateWithoutSaving(
-                    this.navigationScenarios.CLICKED_BACK,
-                    this.$route,
-                    { isCashSelected: true }
+                    this.navigationScenarios.CLICKED_PAY_ON_MY_OWN,
+                    this.pageName
                 );
                 return;
             }
 
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
-            await store.getters.applicationUser.saveSessionPromise;
+            await flushSaveSessionQueue();
 
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 223ca9ee7..a6bb07bab 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -119,6 +119,8 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
 defineRule("license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED));
@@ -138,7 +140,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -163,7 +165,8 @@ export default {
     data() {
         return {
             licensePlate: this.getLicensePlateFromStore(),
-            registrationZipCode: this.getRegistrationZipFromStore() ?? this.$route.query.zipcode,
+            registrationZipCode:
+                this.getRegistrationZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
             emailOrSms: this.getEmailOrSmsFromStore(),
             serviceZipCode: this.getServiceZipFromStore(),
             carId: this.getCarIdfromStore(),
@@ -187,7 +190,10 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
@@ -392,9 +398,7 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 2c5f5a7c3..82b1e1619 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 1d7771474..89568fa37 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index d5c7d93c3..d07434c1f 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,6 +168,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -179,7 +180,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const lineItemsFromStore = deepClone(store.getters.order.lineItems);
 
@@ -281,7 +282,7 @@ export default {
         const oldActivePromos = store.getters.lineItems.promos?.slice(0);
         const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
-        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
+        const promoCodeFromQueryString = consumeQueryFromStash(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
@@ -374,7 +375,7 @@ export default {
         doesCopyContainRouterLink,
         getRouterLinkRouteFromCopy,
         navigateWithScenario(scenarioName) {
-            this.$router.navigateWithoutSaving(scenarioName, this.$route);
+            this.$router.navigateWithoutSaving(scenarioName, this.pageName);
         },
         arePagePrerequisitesValid() {
             // Service Location
@@ -537,7 +538,10 @@ export default {
             return this.$store.getters.order.isRecalAckOptIn;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             this.forwardClicked = true;
@@ -575,16 +579,14 @@ export default {
                 await submitWorkOrder({ pageNameToLog: "payment-method", submitAfterSave: true });
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: false }
+                    this.pageName
                 );
             } else {
                 if (this.paymentMethod == paymentMethods.INSURANCE) {
                     this.dispatchStoreAction(this.storeActions.SAVE_PAYMENT_TYPE, true, false);
                     return this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_INSURANCE,
-                        this.$route
+                        this.pageName
                     );
                 } else {
                     this.setupPia();
@@ -603,16 +605,14 @@ export default {
             } catch (error) {
                 console.log("error: response from pia submit work order:" + error.message);
                 this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] = true;
+                this.$route.query.piaError = true;
                 return;
             }
 
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_PAY_NOW,
-                this.$route,
-                {},
-                { [routerParams.DISPLAY_PIA_ALERT]: false }
+                this.pageName
             );
         },
         hasSubmittedOrder() {
@@ -797,10 +797,7 @@ export default {
             return this.paymentMethodInternalModel;
         },
         shouldDisplayPiaAlert() {
-            return (
-                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] ||
-                getBoolFromString(window.history.state.displayPiaAlert)
-            );
+            return getBoolFromString(this.$route?.query?.piaError);
         },
         // Necessary to make the watcher of lineItems work
         // JavaScript does not keep a record of the old value, only a reference to it's location in the memory.
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index f0b4433ea..b39726948 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -39,20 +39,22 @@ export default {
                 store.getters.order.payment.piaType === paymentMethods.APPLE_PAY ||
                 store.getters.order.payment.piaType === paymentMethods.AFTERPAY;
             if (paymentPageNavScenario) {
-                this.$router.navigateWithoutSaving(
-                    this.navigationScenarios.PIA_CC_ERROR,
-                    this.$route,
-                    {
-                        [queryStrings.DISPLAY_PIA_ALERT]: store.getters.order.payment.piaType,
-                    }
+                const scenarios = {
+                    [paymentMethods.CREDIT_CARD]: this.navigationScenarios.PIA_CC_ERROR,
+                    [paymentMethods.APPLE_PAY]: this.navigationScenarios.PIA_APPLE_ERROR,
+                    [paymentMethods.AFTERPAY]: this.navigationScenarios.PIA_AFTERPAY_ERROR,
+                };
+
+                const relevantScenario = scenarios[store.getters.order.payment.piaType];
+
+                await this.$router.navigateAndForceTopLevelNavigation(
+                    relevantScenario,
+                    this.pageName
                 );
             } else {
-                this.$router.navigateWithoutSaving(
+                await this.$router.navigateAndForceTopLevelNavigation(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
-                    {
-                        [queryStrings.DISPLAY_PIA_ALERT]: true,
-                    }
+                    this.pageName
                 );
             }
         } else {
@@ -84,11 +86,9 @@ export default {
                     } else {
                         var msg = "Unknown Pia type: " + store.getters.order.payment.piaType;
                         console.log(msg);
-                        this.$router.navigateWithoutSaving(
+                        await this.$router.navigateAndForceTopLevelNavigation(
                             this.navigationScenarios.PIA_ERROR,
-                            this.$route,
-                            {},
-                            { [routerParams.DISPLAY_PIA_ALERT]: true }
+                            this.pageName
                         );
                     }
                 }
@@ -123,11 +123,9 @@ export default {
                         " " +
                         store.getters.order.referralSequenceNumber
                 );
-                this.$router.navigateWithoutSaving(
+                this.$router.navigateAndForceTopLevelNavigation(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 const expMonth = getQuerystringParameter(queryStrings.CARD_EXPIRATION_MONTH);
@@ -181,11 +179,9 @@ export default {
                 });
             } catch (error) {
                 console.log("error: response from submit work order:" + error.message);
-                this.$router.navigateWithoutSaving(
+                this.$router.navigateAndForceTopLevelNavigation(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: true }
+                    this.pageName
                 );
                 this.$refs.loadingModal.isModalVisible = false;
                 return;
@@ -193,7 +189,10 @@ export default {
 
             this.$refs.loadingModal.isModalVisible = false;
             await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
-            this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route);
+            this.$router.navigateAndForceTopLevelNavigation(
+                this.navigationScenarios.PIA_SUCCESS,
+                this.pageName
+            );
         },
     },
     components: {
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 3c87f85f2..f2bdb6733 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -289,7 +289,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const signaturePromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_SIGNATURE,
@@ -684,12 +684,16 @@ export default {
                 });
 
                 await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
-                window.location = applicationConfig.CONFIRMATION_URL;
+                this.$router.navigateAndForceTopLevelNavigation(
+                    this.navigationScenarios.CLICKED_PAY_LATER,
+                    this.pageName
+                );
+                //window.location = applicationConfig.CONFIRMATION_URL;
             } catch (error) {
                 console.log("error: response from submit work order(payment pg):" + error.message);
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
+                    this.pageName,
                     {},
                     { [routerParams.DISPLAY_PIA_ALERT]: true }
                 );
@@ -698,16 +702,13 @@ export default {
             }
         },
         backButtonAction() {
-            // The only way I could figure out how to get navigation to work on a page with the iframe.
-            // This is also how a cancel from Paypal would work.  Just a redirect to the payment-method page.
-            // The normal navigation sort of works but the page does not render.  The "next" callback function does not get
-            // invoked in payment-method's beforeroute enter.  I also spotted an error in vue-router.esm-bundler.js when this
-            // happens but was unable to ignore it with a try catch.  The navigation guard error is:
-            // Error: Redirected from "/?fmgPage=payment-method" to "{ params: {isSavingNation: "false"}, query: "fmgPage: "payment-method"}"
-            // I don't know if the navigation guard thinks the to and from are the same page.
-            // Also tried overriding with a $router.push
-            window.location = applicationConfig.PIA_CANCEL_URL;
-            //this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            // Used to set the url directly here.
+            // Now hooks into a shared set of logic for doing this, also used with `payment-pia-return`.
+            // And uses nav scenarios properly.
+            this.$router.navigateAndForceTopLevelNavigation(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         submitHopForm() {
             this.$nextTick(() => {
@@ -804,10 +805,7 @@ export default {
             }
         },
         shouldDisplayPiaAlert(payMethod) {
-            return (
-                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] === payMethod ||
-                getBoolFromString(window.history.state.displayPiaAlert)
-            );
+            return this.$route?.query?.piaErrorType === payMethod;
         },
     },
     components: {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 4a20b4dbc..4e54c7bdc 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -168,16 +168,22 @@ import {
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
 const INSURANCE_TAB_TO_DISPLAY_THRESHOLD_DEFAULT = 300;
 
+const ACCEPTED_QUOTE_TYPES = {
+    CASH: "cash",
+    INSURANCE: "insurance",
+};
+
 export default {
     name: "quote",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_WIPERS,
             {
@@ -214,7 +220,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.query.fmgPage,
+                    pageName: to.name,
                     experiment: skipQuoteExperiment,
                 },
                 "quote",
@@ -244,7 +250,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.query.fmgPage,
+                    pageName: to.name,
                     experiment: afterpayBreakoutDisplayExperiment,
                 },
                 "quote",
@@ -351,7 +357,7 @@ export default {
         const oldActivePromos = store.getters.lineItems.promos?.slice(0);
         const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
-        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
+        const promoCodeFromQueryString = consumeQueryFromStash(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
@@ -401,10 +407,15 @@ export default {
             }
 
             const getIsInsuranceSelectedValue = (availableLineItems, insuranceThreshold) => {
-                // query param checked here is set on insurance-selection "Pay on my own" link click
-                if (to.query?.isCashSelected || to.query?.iscashselected) {
+                // Override auto-select if specified
+                const quoteTypeParam = to.query?.offer?.toLowerCase();
+
+                if (quoteTypeParam === ACCEPTED_QUOTE_TYPES.CASH) {
                     return false;
+                } else if (quoteTypeParam === ACCEPTED_QUOTE_TYPES.INSURANCE) {
+                    return true;
                 }
+
                 const serviceLocationState = store.getters.order.serviceLocation.state;
 
                 // usually true when returning from heritage but can be false when returning from heritage on a save quote
@@ -758,12 +769,12 @@ export default {
             if (payment.isInsurance) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_CASH,
-                    this.$route
+                    this.pageName
                 );
             }
         },
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index d655a0c14..6b2a36f7e 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -55,7 +55,7 @@ export default {
     name: "return-user",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         // Settle promises and get results
         const promiseResultMap = [
             {
@@ -85,7 +85,7 @@ export default {
         async forwardButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_FORWARD,
-                this.$route
+                this.pageName
             );
         },
 
@@ -96,11 +96,9 @@ export default {
                 "Start over",
                 true
             );
-            deleteFunnelCookie();
-            await this.dispatchStoreAction(storeActions.RESET_STATE);
             this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_FORWARD,
-                this.$route
+                this.navigationScenarios.CLICKED_RESTART,
+                this.pageName
             );
         },
     },
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b1e04a734..3d0b29e36 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -267,7 +267,7 @@ export default {
         }
 
         // Set up promises
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const alertReasonsPromise = locationAlerts.methods.loadInitialData(
             store.getters.order.serviceLocation.zipCodeCtu,
@@ -532,7 +532,10 @@ export default {
             }
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         forwardButtonAction() {
             this.updateSupportingItems();
@@ -581,7 +584,10 @@ export default {
                 );
             }
 
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
         setDisplayWaitList() {
             if (
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 88cedcee2..fbc02e08f 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -215,7 +215,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const zipCodeDataPromise = getZipCodeData(serviceZipCode);
@@ -608,7 +608,7 @@ export default {
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.$route
+                    this.pageName
                 );
             }
         },
@@ -748,7 +748,10 @@ export default {
 
             this.updateAndSaveSupportingItems();
             this.updateAndSaveIsMSRFeeApplicable();
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
         openModalAction(modalName) {
             this.$refs[modalName].openModal();
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index ae6ff4ecf..16c6f7f72 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -96,6 +96,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -115,7 +116,7 @@ export default {
     mixins: [vinPagesMixin],
     data() {
         return {
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
+            serviceZipCode: this.getZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
             isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
@@ -127,7 +128,7 @@ export default {
 
     async beforeRouteEnter(to, from, next) {
         //Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         //Settle promises and get results
         const promiseResultMap = [
@@ -214,12 +215,12 @@ export default {
             if (skipVin) {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.$route
+                    this.pageName
                 );
             }
         },
@@ -317,7 +318,7 @@ export default {
                 await saveSession({ pageNameToLog: "service-zip" });
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 // if we're skipping the vin-lookup but it's not a repair, we still need to get the parts
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 46efb4728..488ad1eb4 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -110,7 +110,7 @@ export default {
     name: "vehicle-damage",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const damageOptionsPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_DAMAGE_OPTIONS,
@@ -249,7 +249,10 @@ export default {
 
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
 
         getDamageLocationsFromStore() {
@@ -455,34 +458,26 @@ export default {
                 if (skipVin) {
                     this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                        this.$route,
-                        {},
-                        { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                        this.pageName
                     );
                 } else {
                     if (store.getters.damage.isRepair) {
                         this.$router.navigateWithSaving(
                             this.navigationScenarios
                                 .CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                            this.$route,
-                            {},
-                            { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                            this.pageName
                         );
                     } else {
                         if (store.getters.vehicle.vin) {
                             this.$router.navigateWithSaving(
                                 this.navigationScenarios
                                     .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                                this.$route,
-                                {},
-                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                                this.pageName
                             );
                         } else {
                             this.$router.navigateWithSaving(
                                 this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                                this.$route,
-                                {},
-                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                                this.pageName
                             );
                         }
                     }
@@ -492,23 +487,17 @@ export default {
             else if (store.getters.vehicle.vin) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                    this.pageName
                 );
             } else if (skipVin) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                    this.pageName
                 );
             }
         },
@@ -637,7 +626,7 @@ export default {
             );
         },
         shouldDisplayVehicleChangeAlert() {
-            return getBoolFromString(window.history.state.displayVehicleChangeAlert);
+            return getBoolFromString(this.$route?.query?.displayVehicleChangeAlert);
         },
         shouldHideBackButton() {
             return this.$store.getters.requiresVerifiedRedirecting;
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 280edfc6c..5f06391c1 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -154,7 +154,7 @@ export default {
         },
 
         PartDataFromApi() {
-            return this.$store.getters.pageData(this.$route.query.fmgPage) ?? {};
+            return this.$store.getters.pageData(this.pageName) ?? {};
         },
     },
     methods: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 4b68007f9..4298b74cb 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -81,7 +81,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         // Settle promises and get results
         const promiseResultMap = [
             {
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index bad52fb02..1d2e7d2bb 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -110,6 +110,10 @@ import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { applicationConfig } from "../../constants/application-config";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import {
+    consumeQueryFromStash,
+    peekQueryFromStash,
+} from "@/router/a-rewrite/logic/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
@@ -133,7 +137,7 @@ export default {
             imageUrl: this.getImagefromStore(),
             imageVifNumber: this.getImageVifNumberfromStore(),
             imageVifColor: this.getImageVifColorfromStore(),
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
+            serviceZipCode: this.getZipFromStore() ?? peekQueryFromStash(queryStrings.ZIP_CODE),
             yearOptions: [],
             makeOptions: [],
             modelOptions: [],
@@ -154,7 +158,7 @@ export default {
             );
         }
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         const experimentForLogging = store.getters.applicationUser.experiments.find(
             (e) => e.universeName === experimentUniverses.CONCEPT_FUNNEL
         );
@@ -213,7 +217,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.query.fmgPage,
+                    pageName: to.name,
                     experiment: experimentForLogging,
                 },
                 "vehicle",
@@ -536,7 +540,10 @@ export default {
                 }
             }
 
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
         initializeYearComponent(initialData) {
             this.yearOptions = initialData;
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 23875e3e9..5db93d76d 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -160,6 +160,8 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -180,7 +182,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -203,7 +205,7 @@ export default {
     data() {
         return {
             vin: this.getVinFromStore(),
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
+            serviceZipCode: this.getZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
             isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
@@ -247,12 +249,12 @@ export default {
             if (this.$store.getters.vehicle.vin) {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK_WITH_VIN,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.$route
+                    this.pageName
                 );
             }
         },
@@ -474,9 +476,7 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/main.js b/src/main.js
index 1017651f8..5b823125b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import LoadScript from "vue-plugin-load-script";
 import Maska from "maska";
 import App from "./App.vue";
-import router from "./router";
+import router from "./router/a-rewrite";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 import analyticsMixin from "@/mixins/analytics-mixin.js";
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index b29eae8c1..e39908a8f 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -2,7 +2,7 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
 import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
@@ -15,6 +15,7 @@ export default {
     data() {
         return {
             cmsContentByWidget: {},
+            _componentPageName: null,
         };
     },
     methods: {
@@ -246,9 +247,15 @@ export default {
         cssClassNameForCmsWidget() {
             return "widget-name-" + this.cmsWidgetName;
         },
+        pageName() {
+            return this._componentPageName ?? this.$route.name;
+        },
     },
 
     mounted() {
+        // Store route immutably so that components know their originating page even during page transition.
+        this._componentPageName = this.$route.name;
+
         if (!store.getters.externalParameterState?.isExternalParameter) {
             showFmgLoadingModal(false);
         }
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 517fc7c90..ab39462ce 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -65,10 +65,10 @@ export default {
                 orderedVehicleQuestionPages.indexOf(fmgPage)
             );
         },
-        currentPageComesBeforePage(currentPage = this.$route.query.fmgPage, fmgPage) {
+        currentPageComesBeforePage(currentPage = this.pageName, fmgPage) {
             return this.comparePageIndices(currentPage, fmgPage) < 0;
         },
-        currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
+        currentPageComesAfterPage(currentPage = this.pageName, fmgPage) {
             return this.comparePageIndices(currentPage, fmgPage) > 0;
         },
         setupInitialData(glass, index, alreadyAnsweredQuestions, vm) {
@@ -359,7 +359,7 @@ export default {
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
         async navigateForward(partsOrQuestions, vm) {
             const self = vm ?? this;
-            const currentPage = self.$route.query.fmgPage;
+            const currentPage = self.pageName;
 
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
             const hasGlassLocationWithMultipleParts =
@@ -371,11 +371,9 @@ export default {
                 hasPartQuestions &&
                 this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)
             ) {
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -384,11 +382,9 @@ export default {
             ) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -397,11 +393,9 @@ export default {
             ) {
                 // if any childpart questions
                 // go to molding-questions page and pass the partsData
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -438,11 +432,9 @@ export default {
                     }
                 }
 
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions }
                 );
             } else {
@@ -477,7 +469,7 @@ export default {
                 } else {
                     self.$router.navigateWithSaving(
                         self.navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                        self.$route
+                        self.pageName
                     );
                 }
             }
@@ -485,7 +477,7 @@ export default {
         // Can't use `this` because navigateForward is also called from quote
         async navigateBack(vm) {
             const self = vm ?? this;
-            const currentPage = self.$route.query.fmgPage;
+            const currentPage = self.pageName;
             const pageDataCapabilityQuestions = self.$store.getters.pageData(
                 fmgPageValues.CAPABILITY_QUESTIONS
             );
@@ -539,7 +531,7 @@ export default {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
 
-            self.$router.navigateWithoutSaving(backNavigationScenario, self.$route);
+            self.$router.navigateWithoutSaving(backNavigationScenario, self.pageName);
         },
     },
 };
diff --git a/src/router/a-rewrite/constants/auto-route-table.js b/src/router/a-rewrite/constants/auto-route-table.js
new file mode 100644
index 000000000..0bf3503b9
--- /dev/null
+++ b/src/router/a-rewrite/constants/auto-route-table.js
@@ -0,0 +1,13 @@
+import { routeData } from "./routes";
+
+export const autoRouteTable = [
+    routeData.QUOTE,
+    routeData.CAPABILITY_QUESTIONS,
+    routeData.MOLDING_QUESTIONS,
+    routeData.VEHICLE_PARTS,
+    routeData.PART_QUESTIONS,
+    routeData.VIN_LOOKUP,
+    routeData.ESTIMATE,
+    routeData.VEHICLE_DAMAGE,
+    routeData.VEHICLE,
+];
diff --git a/src/router/a-rewrite/constants/navigation-scenarios.js b/src/router/a-rewrite/constants/navigation-scenarios.js
new file mode 100644
index 000000000..a6e117948
--- /dev/null
+++ b/src/router/a-rewrite/constants/navigation-scenarios.js
@@ -0,0 +1,69 @@
+/**
+ * We want to name these to describe the scenario rather than what page(s) they're used on.
+ *
+ * Naming convention: [PAST_TENSE_VERB]_[DESCRIPTOR_OF_STATE]
+ * ex: Rather than "HAS_PART_QUESTIONS", we might name the
+ *     scenario "CLICKED_FORWARD_WITH_PART_QUESTIONS"
+ */
+
+const navigationScenarios = {
+    // General
+    CLICKED_BACK: "CLICKED_BACK",
+    CLICKED_FORWARD: "CLICKED_FORWARD",
+    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
+    CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
+
+    // TODO: use virtual page?
+    // Vin selection
+    CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
+    CLICKED_BACK_WITH_SKIP_VIN: "CLICKED_BACK_WITH_SKIP_VIN",
+    CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
+    CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE:
+        "CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE",
+    CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE:
+        "CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE",
+    CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
+    CLICKED_FORWARD_WITH_SKIP_VIN: "CLICKED_FORWARD_WITH_SKIP_VIN",
+    CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES: "CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES",
+    SELECTED_VIN_WITH_MISMATCHED_GLASS: "SELECTED_VIN_WITH_MISMATCHED_GLASS",
+    SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
+    SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
+    SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
+    SELECTED_NO_VIN: "SELECTED_NO_VIN",
+    CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
+    CLICKED_VIN_RETRY: "CLICKED_VIN_RETRY",
+
+    // Part selection
+    CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
+    CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE",
+    CLICKED_FORWARD_WITH_MOLDING_QUESTIONS: "CLICKED_FORWARD_WITH_MOLDING_QUESTIONS",
+    CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS: "CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS",
+    CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS: "CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS",
+    CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
+    CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
+    CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
+    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
+    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
+    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
+
+    // Insurance-Company
+    CLICKED_PAY_ON_MY_OWN: "CLICKED_PAY_ON_MY_OWN",
+
+    // Schedule
+    CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
+
+    // Payment
+    CLICKED_INSURANCE: "CLICKED_INSURANCE",
+    CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
+    CLICKED_PAY_LATER: "CLICKED_PAY_LATER",
+    PIA_ERROR: "PIA_ERROR",
+    PIA_CC_ERROR: "PIA_CC_ERROR",
+    PIA_APPLE_ERROR: "PIA_APPLE_ERROR",
+    PIA_AFTERPAY_ERROR: "PIA_AFTERPAY_ERROR",
+    PIA_SUCCESS: "PIA_SUCCESS",
+
+    // Return User
+    CLICKED_RESTART: "CLICKED_RESTART",
+};
+
+export { navigationScenarios };
diff --git a/src/router/a-rewrite/constants/route-prefix.js b/src/router/a-rewrite/constants/route-prefix.js
new file mode 100644
index 000000000..7e5c6f1b9
--- /dev/null
+++ b/src/router/a-rewrite/constants/route-prefix.js
@@ -0,0 +1,3 @@
+export const ROUTE_PREFIX_TRIMMED = "fmg";
+
+export const ROUTE_PREFIX_FULL = `/${ROUTE_PREFIX_TRIMMED}/`;
diff --git a/src/router/a-rewrite/constants/routes.js b/src/router/a-rewrite/constants/routes.js
new file mode 100644
index 000000000..d03954867
--- /dev/null
+++ b/src/router/a-rewrite/constants/routes.js
@@ -0,0 +1,123 @@
+export const routeData = {
+    VEHICLE: {
+        name: "vehicle",
+        path: "/vehicle",
+    },
+    VEHICLE_DAMAGE: {
+        name: "vehicle-damage",
+        path: "/vehicle-damage",
+    },
+    ESTIMATE: {
+        name: "estimate",
+        path: "/estimate",
+    },
+    ADDRESS_LOOKUP: {
+        name: "address-lookup",
+        path: "/address-lookup",
+    },
+    VIN_LOOKUP: {
+        name: "vin-lookup",
+        path: "/vin-lookup",
+    },
+    LICENSE_PLATE_LOOKUP: {
+        name: "license-plate-lookup",
+        path: "/license-plate-lookup",
+    },
+    SERVICE_ZIP: {
+        name: "service-zip",
+        path: "/service-zip",
+    },
+    ADDRESS_VEHICLES: {
+        name: "address-vehicles",
+        path: "/address-vehicles",
+    },
+    VEHICLE_PARTS: {
+        name: "vehicle-parts",
+        path: "/vehicle-parts",
+    },
+    PART_QUESTIONS: {
+        name: "part-questions",
+        path: "/part-questions",
+    },
+    MOLDING_QUESTIONS: {
+        name: "molding-questions",
+        path: "/molding-questions",
+    },
+    CAPABILITY_QUESTIONS: {
+        name: "capability-questions",
+        path: "/capability-questions",
+    },
+    QUOTE: {
+        name: "quote",
+        path: "/quote",
+    },
+    INSURANCE_COMPANY: {
+        name: "insurance-company",
+        path: "/insurance-company",
+    },
+    SERVICE_LOCATION: {
+        name: "service-location",
+        path: "/service-location",
+    },
+    HERITAGE: {
+        name: "heritage",
+        path: "/virtual/heritage",
+        virtual: true,
+    },
+    SCHEDULE: {
+        name: "schedule",
+        path: "/schedule",
+    },
+    CUSTOMER_DETAILS: {
+        name: "customer-details",
+        path: "/customer-details",
+    },
+    PAYMENT_METHOD: {
+        name: "payment-method",
+        path: "/payment-method",
+    },
+    PAYMENT: {
+        name: "payment",
+        path: "/payment",
+    },
+    PAYMENT_PIA_RETURN: {
+        name: "payment-pia-return",
+        path: "/payment-pia-return",
+    },
+    CONFIRMATION: {
+        name: "confirmation",
+        path: "/confirmation",
+    },
+    RETURN_USER: {
+        name: "return-user",
+        path: "/return-user",
+    },
+    LOAD_SESSION: {
+        name: "load-session",
+        path: "/virtual/load-session",
+        virtual: true,
+    },
+    LANDING: {
+        name: "landing",
+        path: "/",
+        virtual: true,
+    },
+    AUTO_ROUTE: {
+        name: "auto-route",
+        path: "/virtual/auto-route",
+        virtual: true,
+    },
+    // TODO: RENAME FROM BAILOUT
+    ERROR: {
+        name: "error",
+        path: "/virtual/error",
+        virtual: true,
+    },
+    RESTART: {
+        name: "restart",
+        path: "/virtual/restart",
+        virtual: true,
+    },
+};
+
+export const FUNNEL_START_PAGE = routeData.VEHICLE;
diff --git a/src/router/a-rewrite/constants/routing-table.js b/src/router/a-rewrite/constants/routing-table.js
new file mode 100644
index 000000000..10ee7ae90
--- /dev/null
+++ b/src/router/a-rewrite/constants/routing-table.js
@@ -0,0 +1,596 @@
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import store from "@/store";
+import { paymentMethods } from "../../../constants/payment-method-constants";
+
+// Get as function to live-evaluate filters
+const routingTable = function () {
+    return [
+        {
+            pageName: routeData.VEHICLE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.VEHICLE_DAMAGE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.VEHICLE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario:
+                        navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario:
+                        navigationScenarios.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+            ],
+        },
+        {
+            pageName: routeData.VIN_LOOKUP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.LICENSE_PLATE_LOOKUP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.ADDRESS_LOOKUP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
+                    destinationPageData: routeData.ADDRESS_VEHICLES,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.ADDRESS_VEHICLES.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ADDRESS_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.ESTIMATE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
+                    destinationPageData: routeData.LICENSE_PLATE_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
+                    destinationPageData: routeData.ADDRESS_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_NO_VIN,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+            ],
+        },
+        {
+            pageName: routeData.SERVICE_ZIP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.PART_QUESTIONS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.VEHICLE_PARTS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.MOLDING_QUESTIONS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.CAPABILITY_QUESTIONS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.QUOTE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
+                    destinationPageData: routeData.SERVICE_LOCATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
+                    destinationPageData: routeData.INSURANCE_COMPANY,
+                },
+            ],
+        },
+        {
+            pageName: routeData.INSURANCE_COMPANY.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_ON_MY_OWN,
+                    destinationPageData: routeData.QUOTE,
+                    params: {
+                        offer: "cash",
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.INSURANCE_DETAILS,
+                },
+            ],
+        },
+        {
+            pageName: routeData.SERVICE_LOCATION.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.SCHEDULE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.SCHEDULE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.SERVICE_LOCATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.CUSTOMER_DETAILS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
+                    destinationPageData: routeData.SERVICE_LOCATION,
+                },
+            ],
+        },
+        {
+            pageName: routeData.CUSTOMER_DETAILS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.SCHEDULE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_NOW,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                },
+            ],
+        },
+        {
+            pageName: routeData.PAYMENT_METHOD.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.CUSTOMER_DETAILS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_NOW,
+                    destinationPageData: routeData.PAYMENT,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_INSURANCE,
+                    destinationPageData: routeData.INSURANCE_COMPANY,
+                },
+            ],
+        },
+        {
+            pageName: routeData.PAYMENT.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
+                {
+                    scenario: navigationScenarios.PIA_ERROR,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                    params: {
+                        piaError: "true",
+                    },
+                },
+            ],
+        },
+        {
+            pageName: routeData.PAYMENT_PIA_RETURN.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.PIA_ERROR,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                    params: {
+                        piaError: "true",
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_CC_ERROR,
+                    destinationPageData: routeData.PAYMENT,
+                    params: {
+                        piaErrorType: paymentMethods.CREDIT_CARD,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_APPLE_ERROR,
+                    destinationPageData: routeData.PAYMENT,
+                    params: {
+                        piaErrorType: paymentMethods.APPLE_PAY,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_AFTERPAY_ERROR,
+                    destinationPageData: routeData.PAYMENT,
+                    params: {
+                        piaErrorType: paymentMethods.AFTERPAY,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_SUCCESS,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
+            ],
+        },
+        {
+            pageName: routeData.CONFIRMATION.name,
+        },
+        {
+            pageName: routeData.RETURN_USER.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.LOAD_SESSION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_RESTART,
+                    destinationPageData: routeData.RESTART,
+                },
+            ],
+        },
+    ];
+};
+
+export { routingTable };
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
new file mode 100644
index 000000000..3a84a1730
--- /dev/null
+++ b/src/router/a-rewrite/index.js
@@ -0,0 +1,421 @@
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { createRoute, createVirtualRoute } from "@/router/a-rewrite/logic/create-route";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { createWebHistory, createRouter } from "vue-router";
+import { getDestination } from "@/router/a-rewrite/logic/get-destination";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import {
+    getFunnelCookie,
+    deleteFunnelCookie,
+    updateOrCreateFunnelCookie,
+} from "@/helpers/heritage-integration/cookie-helper";
+import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
+import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
+import store from "@/store";
+import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations";
+import { sessionStorageKeyConstants } from "@/constants/session-storage";
+import { savePageData } from "@/router/a-rewrite/logic/save-page-data";
+import eventBus from "@/helpers/event-bus/event-bus";
+import { globalEvents, globalEventTypes } from "@/constants/events";
+import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
+import { queryStrings } from "@/constants/query-strings";
+import { consumeReferralQuerystrings } from "@/router/a-rewrite/logic/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/a-rewrite/logic/initialize-from-querystrings";
+import { getBoolFromString } from "@/helpers/boolean-helper";
+import { isVerifiedInsurance } from "@/router/a-rewrite/logic/requires-verified-redirect";
+import baseMixin from "@/mixins/base-mixin";
+import { runExperiments } from "@/router/a-rewrite/logic/run-experiments";
+import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
+import { buildManualUrl } from "@/router/a-rewrite/logic/build-manual-url";
+import { consumeQueryFromStash, stashAllQueries } from "@/router/a-rewrite/logic/querystring-stash";
+
+const routes = [
+    // Non-virtual pages.
+    createRoute(routeData.VEHICLE, async (to, from) => {
+        // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
+        const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
+        if (hasVehicleChanged) {
+            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
+        }
+
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.VEHICLE_DAMAGE.name,
+                replace: true,
+            };
+        }
+    }),
+    createRoute(routeData.VEHICLE_DAMAGE),
+    createRoute(routeData.ESTIMATE),
+    createRoute(routeData.ADDRESS_LOOKUP),
+    createRoute(routeData.VIN_LOOKUP),
+    createRoute(routeData.LICENSE_PLATE_LOOKUP),
+    createRoute(routeData.SERVICE_ZIP),
+    createRoute(routeData.ADDRESS_VEHICLES),
+    createRoute(routeData.VEHICLE_PARTS),
+    createRoute(routeData.PART_QUESTIONS),
+    createRoute(routeData.MOLDING_QUESTIONS),
+    createRoute(routeData.CAPABILITY_QUESTIONS),
+    createRoute(routeData.QUOTE, async (to, from) => {
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.HERITAGE.name,
+                replace: true,
+            };
+        }
+
+        const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
+
+        if (offerQuote === "true") {
+            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
+        }
+    }),
+    createRoute(routeData.INSURANCE_COMPANY, async (to, from) => {
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.HERITAGE.name,
+                replace: true,
+            };
+        }
+    }),
+    createRoute(routeData.SERVICE_LOCATION),
+    createRoute(routeData.SCHEDULE),
+    createRoute(routeData.CUSTOMER_DETAILS),
+    createRoute(routeData.PAYMENT_METHOD),
+    createRoute(routeData.PAYMENT),
+    createRoute(routeData.PAYMENT_PIA_RETURN),
+    createRoute(routeData.CONFIRMATION),
+    createRoute(routeData.RETURN_USER),
+
+    // Virtual pages (resolve to a non-virtual page.)
+    createVirtualRoute(routeData.LANDING, async (to, from) => {
+        await initializeFromQueryStrings();
+        // Save querystrings to temporary stash so they can be referred to later.
+        stashAllQueries(to);
+        // Change referral info. For use in local testing for insurance crossover.
+        await consumeReferralQuerystrings();
+
+        // Check for fmgpage parameter
+        const fmgPage = to?.query?.fmgPage;
+        if (fmgPage && router.hasRoute(fmgPage)) {
+            return {
+                name: fmgPage,
+                replace: true,
+            };
+        }
+
+        // If a session is still in memory, go to return-user.
+        if (store.getters.vehicle?.year > 0) {
+            console.log(`trying to redirect!`);
+            return {
+                name: routeData.RETURN_USER.name,
+                replace: true,
+            };
+        }
+
+        // Otherwise, load session and auto-route
+        return {
+            name: routeData.LOAD_SESSION.name,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.HERITAGE, async (to, from) => {
+        await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
+    }),
+    createVirtualRoute(routeData.LOAD_SESSION, async (to, from) => {
+        const loadSessionResponse = await loadSessionIfPresent(false, to.name);
+
+        return {
+            name: routeData.AUTO_ROUTE.name,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.AUTO_ROUTE, async (to, from) => {
+        for (let i = 0; i < autoRouteTable.length; i++) {
+            const testRouteData = autoRouteTable[i];
+
+            const isReady = await router.checkPagePrerequisites(testRouteData.name);
+
+            if (isReady) {
+                return {
+                    name: testRouteData.name,
+                    replace: true,
+                };
+            }
+        }
+
+        return {
+            name: FUNNEL_START_PAGE,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.ERROR, async (to, from) => {
+        // If we've already encountered one error, clear session to avoid more.
+        // Otherwise mark that we encoutnered an error here.
+        if (store.getters.applicationUser.hasAlreadyTriggeredError) {
+            return {
+                name: routeData.RESTART.name,
+                replace: true,
+            };
+        } else {
+            await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
+        }
+
+        // Add error event to bus
+        eventBus.addEventToBus(
+            globalEvents.Categories.GLOBAL_ALERT,
+            globalEvents.SubCategories.UNKNOWN_ERROR,
+            {
+                isDismissable: true,
+                messageCopy: "",
+                messageHeadline: "We're sorry, something went wrong.",
+                type: globalEventTypes.Danger,
+            }
+        );
+
+        let nextPage = FUNNEL_START_PAGE.name;
+
+        baseMixin.methods?.ResetExternalParamsAndHideModal();
+
+        if (store.getters.payment?.insuranceCoverage?.isVerified) {
+            nextPage = routeData.VEHICLE_DAMAGE.name;
+        }
+
+        if (from.name === nextPage) {
+            // Router won't load the page if we redirect to the already existing page
+            // Force refresh in this scenario.
+            router.go(0);
+            return false;
+        }
+
+        return {
+            name: nextPage,
+            replace: false,
+        };
+    }),
+    createVirtualRoute(routeData.RESTART, async (to, from) => {
+        await store.dispatch(storeActions.RESET_STATE);
+        deleteFunnelCookie();
+
+        if (from.name === FUNNEL_START_PAGE.name) {
+            // Router won't load the page if we redirect to the already existing page
+            // Force refresh in this scenario.
+            router.go(0);
+            return false;
+        }
+
+        return {
+            name: FUNNEL_START_PAGE.name,
+            replace: true,
+        };
+    }),
+];
+
+const router = createRouter({
+    history: createWebHistory(ROUTE_PREFIX_FULL),
+    routes,
+    // Scroll to top on navigation.
+    scrollBehavior(to, from, savedPosition) {
+        return { top: 0 };
+    },
+});
+
+////-- Global Guards
+
+router.beforeEach(async (to, from) => {
+    console.log(to);
+    try {
+        await analyticsMixin.methods.validateSession();
+
+        if (getFunnelCookie()?.SuppressConceptFunnel) {
+            // Redirect to heritage.
+            return {
+                name: routeData.HERITAGE.name,
+            };
+        }
+
+        // Ensure session has not expired
+        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
+            const errorPayload = {
+                cause: "expired session",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            router.bailout(errorPayload, true);
+            return false;
+        }
+
+        // Block navigation if an order has been submitted.
+        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
+            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
+                return false;
+            }
+        }
+
+        // Process funnel cookie.
+        updateOrCreateFunnelCookie();
+
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
+        // Ensure page-prerequisites are fulfilled
+        const arePagePrerequisitesValid = await router.checkPagePrerequisites(to.name);
+
+        if (!arePagePrerequisitesValid) {
+            const errorPayload = {
+                cause: "invalid page prerequisites for page",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            router.bailout(errorPayload);
+            return;
+        }
+
+        await runExperiments(to.name);
+    } catch (error) {
+        const errorPayload = {
+            cause: "Uncaught exception in `beforeEach`.",
+            currentPage: from?.name,
+            nextPage: to?.name,
+        };
+
+        console.log(error);
+
+        router.bailout(errorPayload);
+        return;
+    }
+});
+
+router.afterEach(async (to, from) => {
+    // Push page view to GA
+    analyticsMixin.methods.pushPageViewToGA();
+
+    // Push experiments to Data Layer
+    analyticsMixin.methods.pushExperimentsToDataLayer();
+
+    // Push current order status to Data Layer
+    analyticsMixin.methods.pushOrderToDataLayer();
+});
+
+////-- End Global Guards
+
+////-- Bound Functions
+
+router.getRoute = (pageName) => {
+    return router.getRoutes().find((r) => r.name === pageName);
+};
+
+router.checkPagePrerequisites = async (pageName) => {
+    const route = router.getRoute(pageName);
+
+    if (!route) {
+        return false;
+    }
+
+    let component = route.components;
+
+    // Virtual routes have no component, so skip check.
+    if (!component) {
+        return true;
+    }
+
+    if (component?.default?.methods === undefined) {
+        component = await component?.default();
+    }
+
+    return component?.default?.methods?.arePagePrerequisitesValid();
+};
+
+router.navigateWithoutSaving = async (scenario, currentPageName) => {
+    return await router.navigate(currentPageName, scenario, false);
+};
+
+router.navigateWithSaving = async (scenario, currentPageName) => {
+    return await router.navigate(currentPageName, scenario, true);
+};
+
+router.navigateWithPageData = async (scenario, currentPageName, pageData = {}) => {
+    const nextPage = getDestination(currentPageName, scenario);
+    await savePageData(nextPage.name, pageData);
+
+    return await router.navigate(currentPageName, scenario, true);
+};
+
+router.navigateAndForceTopLevelNavigation = async (scenario, currentPageName, saving = false) => {
+    return await router.navigate(currentPageName, scenario, saving, true);
+};
+
+router.bailout = (errorPayload, forceRestart = false) => {
+    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+
+    if (forceRestart) {
+        router.push({
+            name: routeData.RESTART.name,
+        });
+    } else {
+        router.push({
+            name: routeData.ERROR.name,
+        });
+    }
+};
+
+router.navigate = async (
+    currentPageName,
+    scenario,
+    withSaving = false,
+    forceTopLevelNav = false
+) => {
+    // Check to see if calling page is same as current page.
+    // If not, cancel navigation before it begins.
+    const callingRoute = currentPageName;
+    const actualRoute = router.currentRoute.value.name;
+
+    if (callingRoute !== actualRoute) {
+        return false;
+    }
+
+    const nextPage = getDestination(currentPageName, scenario);
+
+    if (!nextPage) {
+        console.error(
+            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
+        );
+
+        const errorPayload = {
+            cause: "invalid page name",
+            currentPage: currentPageName,
+            nextPage: nextPage?.name,
+        };
+
+        router.bailout(errorPayload);
+        return;
+    }
+
+    if (withSaving) {
+        await saveSession({ pageNameToLog: nextPage.name });
+    }
+
+    // Some pages require manually setting the next url
+    // to work with iframes.
+    if (forceTopLevelNav) {
+        const newUrl = buildManualUrl(nextPage);
+        window.top.location.href = newUrl;
+        return;
+    }
+
+    // All other pages use router.push
+    router.push({
+        name: nextPage.name,
+        query: nextPage.params ?? {},
+    });
+};
+
+////-- End Router Functions
+
+export default router;
diff --git a/src/router/a-rewrite/logic/build-manual-url.js b/src/router/a-rewrite/logic/build-manual-url.js
new file mode 100644
index 000000000..017816d6b
--- /dev/null
+++ b/src/router/a-rewrite/logic/build-manual-url.js
@@ -0,0 +1,27 @@
+import { ROUTE_PREFIX_TRIMMED } from "@/router/a-rewrite/constants/route-prefix";
+
+export function buildManualUrl(nextPage) {
+    const queries = nextPage.params;
+    const querystring = buildSearchParams(queries);
+
+    const url = `${window.top.location.origin}/${ROUTE_PREFIX_TRIMMED}${nextPage.path}${querystring}`;
+
+    return url;
+}
+
+function buildSearchParams(paramList) {
+    if (!paramList) {
+        return "";
+    }
+
+    const keys = Object.keys(paramList);
+    if (keys?.length > 0) {
+        const queryFormattedParams = keys.map((k) => `${k}=${paramList[k]}`);
+
+        const querystring = queryFormattedParams.reduce((a, b) => `${a}&${b}`);
+
+        return `?${querystring}`;
+    }
+
+    return "";
+}
diff --git a/src/router/a-rewrite/logic/consume-referral-info.js b/src/router/a-rewrite/logic/consume-referral-info.js
new file mode 100644
index 000000000..5c1dceafc
--- /dev/null
+++ b/src/router/a-rewrite/logic/consume-referral-info.js
@@ -0,0 +1,18 @@
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { queryStrings } from "@/constants/query-strings";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
+import { updateOrCreateFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+
+export async function consumeReferralQuerystrings() {
+    const referralNumber = getQuerystringParameter(queryStrings.REFERRAL_NUMBER);
+    const parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
+    const correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
+    if (referralNumber) {
+        store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
+        store.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccount);
+        store.commit(storeMutations.UPDATE_REFERRAL_CORRELATION_ID, correlationId);
+        // log(" --update cookie");
+        updateOrCreateFunnelCookie();
+    }
+}
diff --git a/src/router/a-rewrite/logic/create-route.js b/src/router/a-rewrite/logic/create-route.js
new file mode 100644
index 000000000..44e27b568
--- /dev/null
+++ b/src/router/a-rewrite/logic/create-route.js
@@ -0,0 +1,39 @@
+import { lazyLoadComponent } from "@/router/a-rewrite/logic/lazy-load-component";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+
+export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
+    return {
+        name: routeDatum.name,
+        path: routeDatum.path,
+        component: lazyLoadComponent(routeDatum.name),
+        beforeEnter: async (to, from) => {
+            try {
+                return await beforeEnter(to, from);
+            } catch {
+                return {
+                    name: routeData.BAILOUT.name,
+                    replace: true,
+                };
+            }
+        },
+    };
+}
+
+export function createVirtualRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
+    return {
+        name: routeDatum.name,
+        path: routeDatum.path,
+        beforeEnter: async (to, from) => {
+            try {
+                return await beforeEnter(to, from);
+            } catch (error) {
+                console.log(error);
+                return {
+                    name: routeData.BAILOUT.name,
+                    replace: true,
+                };
+            }
+        },
+        virtual: true,
+    };
+}
diff --git a/src/router/a-rewrite/logic/get-destination.js b/src/router/a-rewrite/logic/get-destination.js
new file mode 100644
index 000000000..cd04ddaad
--- /dev/null
+++ b/src/router/a-rewrite/logic/get-destination.js
@@ -0,0 +1,18 @@
+import { routingTable } from "@/router/a-rewrite/constants/routing-table";
+
+export function getDestination(sourcePageName, navigationScenario) {
+    const table = routingTable();
+
+    const pageEntry = table.find((entry) => entry.pageName === sourcePageName);
+
+    const map = pageEntry?.maps?.find((map) => map.scenario === navigationScenario);
+
+    if (!map || map?.filter === false) {
+        return null;
+    }
+
+    return {
+        ...map.destinationPageData,
+        params: map.params,
+    };
+}
diff --git a/src/router/a-rewrite/logic/initialize-from-querystrings.js b/src/router/a-rewrite/logic/initialize-from-querystrings.js
new file mode 100644
index 000000000..2e12f88eb
--- /dev/null
+++ b/src/router/a-rewrite/logic/initialize-from-querystrings.js
@@ -0,0 +1,121 @@
+import {
+    setupAdvertiserTracking,
+    getAffiliateCookies,
+} from "@/helpers/heritage-integration/cookie-helper";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
+import { storeActions } from "@/constants/store-actions";
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { queryStrings } from "@/constants/query-strings";
+import { externalParameterStatus } from "@/constants/external-parameters";
+
+export async function initializeFromQueryStrings() {
+    // Get advertiser info
+    setupAdvertisersAndAffiliates();
+
+    // Read all external paramter queries and write to store.
+    updateExternalParameterState();
+}
+
+function setupAdvertisersAndAffiliates() {
+    const affiliateCookies = getAffiliateCookies();
+    if (affiliateCookies != null && affiliateCookies.length > 0) {
+        store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
+    }
+    setupAdvertiserTracking();
+}
+
+function updateExternalParameterState() {
+    const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
+    const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
+    const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
+    const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
+    const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
+    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
+    const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
+    const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
+    const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
+    const externalParameterServicePackage = getQuerystringParameter(queryStrings.SERVICE_PACKAGE);
+    const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
+    const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
+    const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
+    if (
+        externalParameterYear &&
+        externalParameterMake &&
+        externalParameterModel &&
+        externalParameterStyle
+    ) {
+        resetStoreForExternalParameter();
+        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
+    }
+    if (
+        externalParameterDamage &&
+        (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR" ||
+            externalParameterNumberOfChips?.length > 0)
+    ) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_DAMAGE_TYPE, externalParameterDamage);
+        if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPLACE") {
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS, null);
+        } else if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPAIR") {
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, true);
+            store.commit(
+                storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS,
+                externalParameterNumberOfChips
+            );
+        }
+    }
+    if (externalParameterZipCode) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
+    }
+    if (externalParameterEmail) {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
+            externalParameterEmail
+        );
+    }
+    if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE,
+            externalParameterServicePackage?.toLowerCase()
+        );
+    }
+    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
+            externalParameterVinSelection
+        );
+    }
+    if (externalParameterSource) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_SOURCE, externalParameterSource);
+    }
+    if (externalParameterPhoneNumber) {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
+            externalParameterPhoneNumber
+        );
+    }
+}
+
+// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
+// are returning.  clear out prior related things that need to be selected again like parts and damage type.
+function resetStoreForExternalParameter() {
+    if (
+        store.getters.externalParameterState?.isExternalParameter ==
+        externalParameterStatus.INACTIVE
+    ) {
+        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
+        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
+            state: null,
+            zipCode: null,
+            zipCodeCtu: null,
+        });
+        store.dispatch(storeActions.SAVE_EMAIL, null);
+        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+    }
+}
diff --git a/src/router/a-rewrite/logic/lazy-load-component.js b/src/router/a-rewrite/logic/lazy-load-component.js
new file mode 100644
index 000000000..cb91c06c0
--- /dev/null
+++ b/src/router/a-rewrite/logic/lazy-load-component.js
@@ -0,0 +1,3 @@
+export function lazyLoadComponent(componentName) {
+    return () => import(`@/layouts/${componentName}/${componentName}.vue`);
+}
diff --git a/src/router/a-rewrite/logic/querystring-stash.js b/src/router/a-rewrite/logic/querystring-stash.js
new file mode 100644
index 000000000..96b206572
--- /dev/null
+++ b/src/router/a-rewrite/logic/querystring-stash.js
@@ -0,0 +1,58 @@
+import { reactive } from "vue";
+
+const queryStash = reactive({
+    queries: [],
+});
+
+function stash(key, value) {
+    const existingValue = getStashedQuery(key);
+
+    if (existingValue) {
+        existingValue.value = value;
+        existingValue.used = false;
+        return;
+    }
+
+    queryStash.queries.push({
+        key: key,
+        value: value,
+        used: false,
+    });
+}
+
+export function stashAllQueries(toRoute) {
+    const keys = Object.keys(toRoute.query);
+
+    keys.forEach((k) => stash(k, toRoute.query[k]));
+}
+
+function getStashedQuery(key) {
+    const match = queryStash.queries.find(
+        (entry) => entry?.key?.toLowerCase() === key?.toLowerCase()
+    );
+
+    return match;
+}
+
+export function peekQueryFromStash(key) {
+    return getStashedQuery(key)?.value;
+}
+
+export function consumeQueryFromStash(key) {
+    const match = getStashedQuery(key);
+
+    if (match) {
+        if (!match.used) {
+            match.used = true;
+            return match.value;
+        }
+
+        return null;
+    }
+
+    return null;
+}
+
+export function clearStash() {
+    queryStash.queries = [];
+}
diff --git a/src/router/a-rewrite/logic/requires-verified-redirect.js b/src/router/a-rewrite/logic/requires-verified-redirect.js
new file mode 100644
index 000000000..19f088687
--- /dev/null
+++ b/src/router/a-rewrite/logic/requires-verified-redirect.js
@@ -0,0 +1,8 @@
+import store from "@/store";
+
+export function isVerifiedInsurance() {
+    return (
+        store.getters.payment?.insuranceCoverage?.isVerified ||
+        store.getters.order?.referralNumber?.length === 6
+    );
+}
diff --git a/src/router/a-rewrite/logic/run-experiments.js b/src/router/a-rewrite/logic/run-experiments.js
new file mode 100644
index 000000000..97472ad0c
--- /dev/null
+++ b/src/router/a-rewrite/logic/run-experiments.js
@@ -0,0 +1,30 @@
+import store from "@/store";
+import baseMixin from "@/mixins/base-mixin";
+import { storeActions } from "@/constants/store-actions";
+import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
+import { experimentTriggers } from "@/constants/experiments";
+import { applicationConfig } from "@/constants/application-config";
+
+export async function runExperiments(nextPageName) {
+    if (!store.getters.applicationUser.triggeredSiteEntry) {
+        await baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
+            {
+                deviceId: getDeviceIdValue(),
+                triggerEvent: experimentTriggers.SITE_ENTRY,
+                triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
+            },
+            nextPageName
+        );
+    }
+
+    await baseMixin.methods.dispatchStoreActionWithLogging(
+        storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
+        {
+            deviceId: getDeviceIdValue(),
+            triggerEvent: experimentTriggers.PAGE_ENTRY,
+            triggerValue: nextPageName,
+        },
+        nextPageName
+    );
+}
diff --git a/src/router/a-rewrite/logic/save-page-data.js b/src/router/a-rewrite/logic/save-page-data.js
new file mode 100644
index 000000000..1299f8900
--- /dev/null
+++ b/src/router/a-rewrite/logic/save-page-data.js
@@ -0,0 +1,11 @@
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
+
+export async function savePageData(page, data) {
+    const existingPageData = store.getters.pageData(page);
+
+    const dataToSave = Object.keys(data).length > 0 ? data : (existingPageData ?? {});
+
+    // Save data if non-null
+    store.commit(storeMutations.UPDATE_PAGE_DATA, { page: page, data: dataToSave });
+}
diff --git a/src/store/index.js b/src/store/index.js
index c36af8bb0..b545f769e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -199,6 +199,7 @@ const getDefaultState = () => {
             triggeredSiteEntry: false,
             affiliateCookies: [],
             loggingOption: false,
+            hasAlreadyTriggeredError: false,
         },
     };
 };
@@ -820,6 +821,9 @@ export const mutations = {
     updateAffiliateCookies(state, affiliateCookies) {
         state.applicationUser.affiliateCookies = affiliateCookies;
     },
+    updateHasTriggeredError(state, hasTriggeredError) {
+        state.applicationUser.hasAlreadyTriggeredError = hasTriggeredError;
+    },
 };
 
 // Export Getters
@@ -3419,6 +3423,10 @@ export const actions = {
             }
         }
     },
+
+    updateHasTriggeredError(context, hasAlreadyTriggeredError) {
+        context.commit(storeMutations.UPDATE_HAS_TRIGGERED_ERROR, hasAlreadyTriggeredError);
+    },
 };
 
 export default createStore({

From 168a948d04d8d3331286b0636e93fb8d70c12b73 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Tue, 6 May 2025 13:04:42 -0400
Subject: [PATCH 08/64] CASH-535 - New field needed for datalayer
 (CashSubtotal)

---
 src/constants/analytics.js                      | 15 +++++++++++++--
 src/constants/store-mutations.js                |  1 +
 src/layouts/quote/quote.vue                     | 17 ++++++++---------
 .../service-package-question.vue                |  9 +++++++++
 src/mixins/analytics-mixin.js                   |  8 ++++++++
 src/store/index.js                              |  4 ++++
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index f6534cda4..3461d82d1 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -23,7 +23,6 @@ const GaActions = {
     SUBMITTED: "Submitted",
     DISPLAYED: "Displayed",
     CASH_QUOTE_DISPLAYED: "Cash quote displayed",
-    SERVICE_PACKAGE_PRICE: "Service package price",
     MOBILE_AVAILABLE: "mobile_available",
     SHOPS_FIRST_DISPLAYED: "shops_first_displayed",
     MORE_LOCATIONS_CLICKED: "more_locations_clicked",
@@ -43,4 +42,16 @@ const ValueToLogTypes = {
     LAST_5: "last_5",
 };
 
-export { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes };
+const Variables = {
+    CASH_SUBTOTAL: "cashSubTotal",
+};
+
+export {
+    analyticsPageEvents,
+    GaCategories,
+    GaActions,
+    GaLabels,
+    GaEvents,
+    ValueToLogTypes,
+    Variables,
+};
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 2f53d8133..89c82e3c9 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -69,6 +69,7 @@ const storeMutations = {
     UPDATE_SETTLED_TENDER_AMOUNT: "updateSettledTenderAmount",
     UPDATE_IS_RECAL_ACK_OPT_IN: "updateIsRecalAckOptIn",
     UPDATE_IS_MSR_FEE_APPLICABLE: "updateIsMSRFeeApplicable",
+    UPDATE_CASH_SUBTOTAL: "updateCashSubTotal",
 
     // EVENT BUS MUTATIONS
     ADD_EVENT_TO_BUS: "addEventToBus",
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 4a20b4dbc..c4ae1ff4c 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -789,8 +789,10 @@ export default {
             });
             this.$nextTick(() => {
                 const availablePackageNames = this.$refs.servicePackage?.servicePackageAnswers;
-                var eventLabel = "";
-                availablePackageNames?.forEach((tier) => {
+                var priceLabel = "";
+
+                if (availablePackageNames.length > 1 || availablePackageNames.length == 1) {
+                    var tier = availablePackageNames[0];
                     if (tier) {
                         let lineItemsToPrice = this.availableLineItems;
                         if (this.isRecalibrationOnOrder && this.shouldHideRecalibration) {
@@ -815,14 +817,11 @@ export default {
                             baseMixin.methods.filterOutFees(lineItemsToPrice)
                         );
                         price += this.$refs.servicePackage.getVapsPrice(tier.value);
-                        const formattedPrice = parseFloat(price).toFixed(2);
-                        eventLabel += tier.value + "_" + formattedPrice;
+                        priceLabel = price.toFixed(2);
                     }
-                    eventLabel += ",";
-                });
-                eventLabel = eventLabel.slice(0, -1);
-
-                this.pushEventToGA("quote", this.GaActions.SERVICE_PACKAGE_PRICE, eventLabel, true);
+                }
+                const subTotalLabel = this.Variables.CASH_SUBTOTAL;
+                this.pushVariableToDataLayer({ [subTotalLabel]: priceLabel });
             });
         },
         async skip(insuranceSelection, packageSelection) {
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 64c075408..10dfb2724 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -21,6 +21,8 @@ import servicePackageRadioExperiment from "@/experiment-components/service-packa
 import servicePackageRadioAfterpayExperiment from "@/experiment-components/service-package-radio-for-afterpay";
 import { partTypeStrings } from "@/constants/part-type-strings";
 import { packageNames } from "@/constants/package-names";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
 import {
     shouldFrontWipersBeAvailable,
     shouldRearWipersBeAvailable,
@@ -161,6 +163,13 @@ export default {
                     isInsuranceSelected: this.isInsuranceSelected,
                 },
             }));
+            if (availablePackages.length > 1 || availablePackages.length == 1) {
+                let price = this.getPackagePrice(availablePackages[0].packageName, {
+                    discountedPrice: false,
+                    servicePackageDiscount: false,
+                });
+                store.commit(storeMutations.UPDATE_CASH_SUBTOTAL, price?.toFixed(2));
+            }
             this.$emit("currentNumberOfPackages", modifiedAnswers.length);
             return modifiedAnswers;
         },
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index d6e608d4b..05d6f2632 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -30,6 +30,7 @@ import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import router from "@/router/index.js";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { Variables } from "../constants/analytics";
 
 export default {
     methods: {
@@ -120,6 +121,10 @@ export default {
             }
         },
 
+        async pushVariableToDataLayer(data) {
+            pushToDataLayerIfDefined(data);
+        },
+
         async pushPageViewToGA() {
             const currentPageName = getPageNameByQueryString();
             const pageViewEvent = {
@@ -770,6 +775,9 @@ export default {
         ValueToLogTypes() {
             return ValueToLogTypes;
         },
+        Variables() {
+            return Variables;
+        },
     },
 };
 
diff --git a/src/store/index.js b/src/store/index.js
index c36af8bb0..973108d3f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -340,6 +340,9 @@ export const mutations = {
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {
         state.order.isMSRFeeApplicable = isMSRFeeApplicable;
     },
+    updateCashSubTotal(state, cashSubTotal) {
+        state.order.cashSubTotal = cashSubTotal;
+    },
     updateCCToken(state, ccToken) {
         state.order.payment.ccToken.subscriptionId = ccToken.subscriptionId;
         state.order.payment.ccToken.expMonth = ccToken.expMonth;
@@ -2339,6 +2342,7 @@ export const actions = {
                     lockToken: order.lockToken,
                     isRecalAckOptIn: order.isRecalAckOptIn,
                     isMSRFeeApplicable: order.isMSRFeeApplicable,
+                    cashSubTotal: order.cashSubTotal,
                 },
             },
             logApiCall: true,

From fac7866e75b998fd20fdce32fa8068229c734f3e Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 6 May 2025 14:13:33 -0400
Subject: [PATCH 09/64] Big split

---
 src/layouts/estimate/estimate.vue             |   2 +-
 .../license-plate-lookup.vue                  |   2 +-
 src/layouts/payment-method/payment-method.vue |   2 +-
 src/layouts/quote/quote.vue                   |   2 +-
 src/layouts/service-zip/service-zip.vue       |   2 +-
 src/layouts/vehicle/vehicle.vue               |   2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |   2 +-
 .../a-rewrite/constants/externalUrl-values.js |   6 +
 src/router/a-rewrite/index.js                 | 425 +-----------------
 src/router/a-rewrite/methods/after-each.js    |  12 +
 src/router/a-rewrite/methods/before-each.js   |  83 ++++
 src/router/a-rewrite/methods/error.js         |  17 +
 src/router/a-rewrite/methods/get-route.js     |   5 +
 .../helpers}/build-manual-url.js              |   2 +-
 .../helpers}/consume-referral-info.js         |   0
 .../helpers}/create-route.js                  |   2 +-
 .../helpers}/get-destination.js               |   0
 .../helpers}/initialize-from-querystrings.js  |   0
 .../helpers}/lazy-load-component.js           |   0
 .../helpers}/querystring-stash.js             |   0
 .../helpers}/requires-verified-redirect.js    |   0
 .../helpers}/run-experiments.js               |   0
 .../helpers}/save-page-data.js                |   0
 .../a-rewrite/methods/navigate-external.js    |  10 +
 src/router/a-rewrite/methods/navigate.js      |  84 ++++
 .../a-rewrite/methods/page-prerequisites.js   |  22 +
 .../methods/route-logic/auto-route.js         |  23 +
 .../a-rewrite/methods/route-logic/error.js    |  52 +++
 .../a-rewrite/methods/route-logic/heritage.js |   5 +
 .../methods/route-logic/insurance-company.js  |  11 +
 .../a-rewrite/methods/route-logic/landing.js  |  38 ++
 .../methods/route-logic/load-session.js       |  11 +
 .../a-rewrite/methods/route-logic/quote.js    |  20 +
 .../a-rewrite/methods/route-logic/restart.js  |  22 +
 .../a-rewrite/methods/route-logic/vehicle.js  |  21 +
 src/router/a-rewrite/methods/routes.js        |  46 ++
 36 files changed, 518 insertions(+), 413 deletions(-)
 create mode 100644 src/router/a-rewrite/constants/externalUrl-values.js
 create mode 100644 src/router/a-rewrite/methods/after-each.js
 create mode 100644 src/router/a-rewrite/methods/before-each.js
 create mode 100644 src/router/a-rewrite/methods/error.js
 create mode 100644 src/router/a-rewrite/methods/get-route.js
 rename src/router/a-rewrite/{logic => methods/helpers}/build-manual-url.js (93%)
 rename src/router/a-rewrite/{logic => methods/helpers}/consume-referral-info.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/create-route.js (92%)
 rename src/router/a-rewrite/{logic => methods/helpers}/get-destination.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/initialize-from-querystrings.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/lazy-load-component.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/querystring-stash.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/requires-verified-redirect.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/run-experiments.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/save-page-data.js (100%)
 create mode 100644 src/router/a-rewrite/methods/navigate-external.js
 create mode 100644 src/router/a-rewrite/methods/navigate.js
 create mode 100644 src/router/a-rewrite/methods/page-prerequisites.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/auto-route.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/error.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/heritage.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/insurance-company.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/landing.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/load-session.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/quote.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/restart.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/vehicle.js
 create mode 100644 src/router/a-rewrite/methods/routes.js

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 0a5db7d74..66d1544d9 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index a6bb07bab..673116965 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -119,7 +119,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index d07434c1f..51a3ffd5d 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,7 +168,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 4e54c7bdc..2009384ee 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -168,7 +168,7 @@ import {
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 16c6f7f72..6e0bccda6 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -96,7 +96,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 1d2e7d2bb..8686be85b 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -113,7 +113,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import {
     consumeQueryFromStash,
     peekQueryFromStash,
-} from "@/router/a-rewrite/logic/querystring-stash";
+} from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 5db93d76d..277e176f5 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -160,7 +160,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
diff --git a/src/router/a-rewrite/constants/externalUrl-values.js b/src/router/a-rewrite/constants/externalUrl-values.js
new file mode 100644
index 000000000..5516095c4
--- /dev/null
+++ b/src/router/a-rewrite/constants/externalUrl-values.js
@@ -0,0 +1,6 @@
+const externalUrls = {
+    HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
+    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
+};
+
+export { externalUrls };
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
index 3a84a1730..37bd5aa0d 100644
--- a/src/router/a-rewrite/index.js
+++ b/src/router/a-rewrite/index.js
@@ -1,216 +1,16 @@
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { createRoute, createVirtualRoute } from "@/router/a-rewrite/logic/create-route";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { createWebHistory, createRouter } from "vue-router";
-import { getDestination } from "@/router/a-rewrite/logic/get-destination";
-import analyticsMixin from "@/mixins/analytics-mixin";
+import { routes } from "@/router/a-rewrite/methods/routes";
+import { afterEach } from "@/router/a-rewrite/methods/after-each";
+import { beforeEach } from "@/router/a-rewrite/methods/before-each";
+import { bailout } from "@/router/a-rewrite/methods/error";
 import {
-    getFunnelCookie,
-    deleteFunnelCookie,
-    updateOrCreateFunnelCookie,
-} from "@/helpers/heritage-integration/cookie-helper";
-import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
-import store from "@/store";
-import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
-import { sessionStorageKeyConstants } from "@/constants/session-storage";
-import { savePageData } from "@/router/a-rewrite/logic/save-page-data";
-import eventBus from "@/helpers/event-bus/event-bus";
-import { globalEvents, globalEventTypes } from "@/constants/events";
-import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
-import { queryStrings } from "@/constants/query-strings";
-import { consumeReferralQuerystrings } from "@/router/a-rewrite/logic/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/a-rewrite/logic/initialize-from-querystrings";
-import { getBoolFromString } from "@/helpers/boolean-helper";
-import { isVerifiedInsurance } from "@/router/a-rewrite/logic/requires-verified-redirect";
-import baseMixin from "@/mixins/base-mixin";
-import { runExperiments } from "@/router/a-rewrite/logic/run-experiments";
+    navigateWithoutSaving,
+    navigateWithSaving,
+    navigateWithPageData,
+    navigateAndForceTopLevelNavigation,
+} from "@/router/a-rewrite/methods/navigate";
+import { navigateToExternalUrl } from "@/router/a-rewrite/methods/navigate-external";
+import { createWebHistory, createRouter } from "vue-router";
 import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
-import { buildManualUrl } from "@/router/a-rewrite/logic/build-manual-url";
-import { consumeQueryFromStash, stashAllQueries } from "@/router/a-rewrite/logic/querystring-stash";
-
-const routes = [
-    // Non-virtual pages.
-    createRoute(routeData.VEHICLE, async (to, from) => {
-        // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
-        const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
-        if (hasVehicleChanged) {
-            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
-        }
-
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.VEHICLE_DAMAGE.name,
-                replace: true,
-            };
-        }
-    }),
-    createRoute(routeData.VEHICLE_DAMAGE),
-    createRoute(routeData.ESTIMATE),
-    createRoute(routeData.ADDRESS_LOOKUP),
-    createRoute(routeData.VIN_LOOKUP),
-    createRoute(routeData.LICENSE_PLATE_LOOKUP),
-    createRoute(routeData.SERVICE_ZIP),
-    createRoute(routeData.ADDRESS_VEHICLES),
-    createRoute(routeData.VEHICLE_PARTS),
-    createRoute(routeData.PART_QUESTIONS),
-    createRoute(routeData.MOLDING_QUESTIONS),
-    createRoute(routeData.CAPABILITY_QUESTIONS),
-    createRoute(routeData.QUOTE, async (to, from) => {
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.HERITAGE.name,
-                replace: true,
-            };
-        }
-
-        const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
-
-        if (offerQuote === "true") {
-            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
-        }
-    }),
-    createRoute(routeData.INSURANCE_COMPANY, async (to, from) => {
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.HERITAGE.name,
-                replace: true,
-            };
-        }
-    }),
-    createRoute(routeData.SERVICE_LOCATION),
-    createRoute(routeData.SCHEDULE),
-    createRoute(routeData.CUSTOMER_DETAILS),
-    createRoute(routeData.PAYMENT_METHOD),
-    createRoute(routeData.PAYMENT),
-    createRoute(routeData.PAYMENT_PIA_RETURN),
-    createRoute(routeData.CONFIRMATION),
-    createRoute(routeData.RETURN_USER),
-
-    // Virtual pages (resolve to a non-virtual page.)
-    createVirtualRoute(routeData.LANDING, async (to, from) => {
-        await initializeFromQueryStrings();
-        // Save querystrings to temporary stash so they can be referred to later.
-        stashAllQueries(to);
-        // Change referral info. For use in local testing for insurance crossover.
-        await consumeReferralQuerystrings();
-
-        // Check for fmgpage parameter
-        const fmgPage = to?.query?.fmgPage;
-        if (fmgPage && router.hasRoute(fmgPage)) {
-            return {
-                name: fmgPage,
-                replace: true,
-            };
-        }
-
-        // If a session is still in memory, go to return-user.
-        if (store.getters.vehicle?.year > 0) {
-            console.log(`trying to redirect!`);
-            return {
-                name: routeData.RETURN_USER.name,
-                replace: true,
-            };
-        }
-
-        // Otherwise, load session and auto-route
-        return {
-            name: routeData.LOAD_SESSION.name,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.HERITAGE, async (to, from) => {
-        await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
-    }),
-    createVirtualRoute(routeData.LOAD_SESSION, async (to, from) => {
-        const loadSessionResponse = await loadSessionIfPresent(false, to.name);
-
-        return {
-            name: routeData.AUTO_ROUTE.name,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.AUTO_ROUTE, async (to, from) => {
-        for (let i = 0; i < autoRouteTable.length; i++) {
-            const testRouteData = autoRouteTable[i];
-
-            const isReady = await router.checkPagePrerequisites(testRouteData.name);
-
-            if (isReady) {
-                return {
-                    name: testRouteData.name,
-                    replace: true,
-                };
-            }
-        }
-
-        return {
-            name: FUNNEL_START_PAGE,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.ERROR, async (to, from) => {
-        // If we've already encountered one error, clear session to avoid more.
-        // Otherwise mark that we encoutnered an error here.
-        if (store.getters.applicationUser.hasAlreadyTriggeredError) {
-            return {
-                name: routeData.RESTART.name,
-                replace: true,
-            };
-        } else {
-            await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
-        }
-
-        // Add error event to bus
-        eventBus.addEventToBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.UNKNOWN_ERROR,
-            {
-                isDismissable: true,
-                messageCopy: "",
-                messageHeadline: "We're sorry, something went wrong.",
-                type: globalEventTypes.Danger,
-            }
-        );
-
-        let nextPage = FUNNEL_START_PAGE.name;
-
-        baseMixin.methods?.ResetExternalParamsAndHideModal();
-
-        if (store.getters.payment?.insuranceCoverage?.isVerified) {
-            nextPage = routeData.VEHICLE_DAMAGE.name;
-        }
-
-        if (from.name === nextPage) {
-            // Router won't load the page if we redirect to the already existing page
-            // Force refresh in this scenario.
-            router.go(0);
-            return false;
-        }
-
-        return {
-            name: nextPage,
-            replace: false,
-        };
-    }),
-    createVirtualRoute(routeData.RESTART, async (to, from) => {
-        await store.dispatch(storeActions.RESET_STATE);
-        deleteFunnelCookie();
-
-        if (from.name === FUNNEL_START_PAGE.name) {
-            // Router won't load the page if we redirect to the already existing page
-            // Force refresh in this scenario.
-            router.go(0);
-            return false;
-        }
-
-        return {
-            name: FUNNEL_START_PAGE.name,
-            replace: true,
-        };
-    }),
-];
 
 const router = createRouter({
     history: createWebHistory(ROUTE_PREFIX_FULL),
@@ -221,201 +21,18 @@ const router = createRouter({
     },
 });
 
-////-- Global Guards
+// Set guards
+router.afterEach(async (to, from) => afterEach(to, from));
+router.beforeEach(async (to, from) => beforeEach(to, from));
 
-router.beforeEach(async (to, from) => {
-    console.log(to);
-    try {
-        await analyticsMixin.methods.validateSession();
+// Bind methods for external use
+router.navigateWithSaving = navigateWithSaving;
+router.navigateWithoutSaving = navigateWithoutSaving;
+router.navigateWithPageData = navigateWithPageData;
+router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
 
-        if (getFunnelCookie()?.SuppressConceptFunnel) {
-            // Redirect to heritage.
-            return {
-                name: routeData.HERITAGE.name,
-            };
-        }
+router.bailout = bailout;
 
-        // Ensure session has not expired
-        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
-            const errorPayload = {
-                cause: "expired session",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            router.bailout(errorPayload, true);
-            return false;
-        }
-
-        // Block navigation if an order has been submitted.
-        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
-            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
-                return false;
-            }
-        }
-
-        // Process funnel cookie.
-        updateOrCreateFunnelCookie();
-
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
-        // Ensure page-prerequisites are fulfilled
-        const arePagePrerequisitesValid = await router.checkPagePrerequisites(to.name);
-
-        if (!arePagePrerequisitesValid) {
-            const errorPayload = {
-                cause: "invalid page prerequisites for page",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            router.bailout(errorPayload);
-            return;
-        }
-
-        await runExperiments(to.name);
-    } catch (error) {
-        const errorPayload = {
-            cause: "Uncaught exception in `beforeEach`.",
-            currentPage: from?.name,
-            nextPage: to?.name,
-        };
-
-        console.log(error);
-
-        router.bailout(errorPayload);
-        return;
-    }
-});
-
-router.afterEach(async (to, from) => {
-    // Push page view to GA
-    analyticsMixin.methods.pushPageViewToGA();
-
-    // Push experiments to Data Layer
-    analyticsMixin.methods.pushExperimentsToDataLayer();
-
-    // Push current order status to Data Layer
-    analyticsMixin.methods.pushOrderToDataLayer();
-});
-
-////-- End Global Guards
-
-////-- Bound Functions
-
-router.getRoute = (pageName) => {
-    return router.getRoutes().find((r) => r.name === pageName);
-};
-
-router.checkPagePrerequisites = async (pageName) => {
-    const route = router.getRoute(pageName);
-
-    if (!route) {
-        return false;
-    }
-
-    let component = route.components;
-
-    // Virtual routes have no component, so skip check.
-    if (!component) {
-        return true;
-    }
-
-    if (component?.default?.methods === undefined) {
-        component = await component?.default();
-    }
-
-    return component?.default?.methods?.arePagePrerequisitesValid();
-};
-
-router.navigateWithoutSaving = async (scenario, currentPageName) => {
-    return await router.navigate(currentPageName, scenario, false);
-};
-
-router.navigateWithSaving = async (scenario, currentPageName) => {
-    return await router.navigate(currentPageName, scenario, true);
-};
-
-router.navigateWithPageData = async (scenario, currentPageName, pageData = {}) => {
-    const nextPage = getDestination(currentPageName, scenario);
-    await savePageData(nextPage.name, pageData);
-
-    return await router.navigate(currentPageName, scenario, true);
-};
-
-router.navigateAndForceTopLevelNavigation = async (scenario, currentPageName, saving = false) => {
-    return await router.navigate(currentPageName, scenario, saving, true);
-};
-
-router.bailout = (errorPayload, forceRestart = false) => {
-    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-
-    if (forceRestart) {
-        router.push({
-            name: routeData.RESTART.name,
-        });
-    } else {
-        router.push({
-            name: routeData.ERROR.name,
-        });
-    }
-};
-
-router.navigate = async (
-    currentPageName,
-    scenario,
-    withSaving = false,
-    forceTopLevelNav = false
-) => {
-    // Check to see if calling page is same as current page.
-    // If not, cancel navigation before it begins.
-    const callingRoute = currentPageName;
-    const actualRoute = router.currentRoute.value.name;
-
-    if (callingRoute !== actualRoute) {
-        return false;
-    }
-
-    const nextPage = getDestination(currentPageName, scenario);
-
-    if (!nextPage) {
-        console.error(
-            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
-        );
-
-        const errorPayload = {
-            cause: "invalid page name",
-            currentPage: currentPageName,
-            nextPage: nextPage?.name,
-        };
-
-        router.bailout(errorPayload);
-        return;
-    }
-
-    if (withSaving) {
-        await saveSession({ pageNameToLog: nextPage.name });
-    }
-
-    // Some pages require manually setting the next url
-    // to work with iframes.
-    if (forceTopLevelNav) {
-        const newUrl = buildManualUrl(nextPage);
-        window.top.location.href = newUrl;
-        return;
-    }
-
-    // All other pages use router.push
-    router.push({
-        name: nextPage.name,
-        query: nextPage.params ?? {},
-    });
-};
-
-////-- End Router Functions
+router.navigateToExternalUrl = navigateToExternalUrl;
 
 export default router;
diff --git a/src/router/a-rewrite/methods/after-each.js b/src/router/a-rewrite/methods/after-each.js
new file mode 100644
index 000000000..ef3dc0d93
--- /dev/null
+++ b/src/router/a-rewrite/methods/after-each.js
@@ -0,0 +1,12 @@
+import analyticsMixin from "@/mixins/analytics-mixin";
+
+export async function afterEach(to, from) {
+    // Push page view to GA
+    analyticsMixin.methods.pushPageViewToGA();
+
+    // Push experiments to Data Layer
+    analyticsMixin.methods.pushExperimentsToDataLayer();
+
+    // Push current order status to Data Layer
+    analyticsMixin.methods.pushOrderToDataLayer();
+}
diff --git a/src/router/a-rewrite/methods/before-each.js b/src/router/a-rewrite/methods/before-each.js
new file mode 100644
index 000000000..05264ed3c
--- /dev/null
+++ b/src/router/a-rewrite/methods/before-each.js
@@ -0,0 +1,83 @@
+import { queryStrings } from "@/constants/query-strings";
+import { sessionStorageKeyConstants } from "@/constants/session-storage";
+import {
+    getFunnelCookie,
+    updateOrCreateFunnelCookie,
+} from "@/helpers/heritage-integration/cookie-helper";
+import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
+import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { runExperiments } from "@/router/a-rewrite/methods/helpers/run-experiments";
+
+import { bailout } from "@/router/a-rewrite/methods/error";
+import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+
+export async function beforeEach(to, from) {
+    try {
+        await analyticsMixin.methods.validateSession();
+
+        if (getFunnelCookie()?.SuppressConceptFunnel) {
+            // Redirect to heritage.
+            return {
+                name: routeData.HERITAGE.name,
+            };
+        }
+
+        // Ensure session has not expired
+        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
+            const errorPayload = {
+                cause: "expired session",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            bailout(errorPayload, true);
+            return false;
+        }
+
+        // Block navigation if an order has been submitted.
+        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
+            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
+                return false;
+            }
+        }
+
+        // Process funnel cookie.
+        updateOrCreateFunnelCookie();
+
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
+        // Ensure page-prerequisites are fulfilled
+        const arePagePrerequisitesValid = await checkPagePrerequisites(to.name);
+
+        if (!arePagePrerequisitesValid) {
+            const errorPayload = {
+                cause: "invalid page prerequisites for page",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            bailout(errorPayload);
+            return;
+        }
+
+        await runExperiments(to.name);
+    } catch (error) {
+        const errorPayload = {
+            cause: "Uncaught exception in `beforeEach`.",
+            currentPage: from?.name,
+            nextPage: to?.name,
+        };
+
+        console.log(error);
+
+        bailout(errorPayload);
+        return;
+    }
+}
diff --git a/src/router/a-rewrite/methods/error.js b/src/router/a-rewrite/methods/error.js
new file mode 100644
index 000000000..3c50c1768
--- /dev/null
+++ b/src/router/a-rewrite/methods/error.js
@@ -0,0 +1,17 @@
+import analyticsMixin from "@/mixins/analytics-mixin";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import router from "@/router/a-rewrite";
+
+export async function bailout(errorPayload, forceRestart = false) {
+    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+
+    if (forceRestart) {
+        router.push({
+            name: routeData.RESTART.name,
+        });
+    } else {
+        router.push({
+            name: routeData.ERROR.name,
+        });
+    }
+}
diff --git a/src/router/a-rewrite/methods/get-route.js b/src/router/a-rewrite/methods/get-route.js
new file mode 100644
index 000000000..ead89eb5b
--- /dev/null
+++ b/src/router/a-rewrite/methods/get-route.js
@@ -0,0 +1,5 @@
+import router from "@/router/a-rewrite";
+
+export function getRoute(pageName) {
+    return router.getRoutes().find((r) => r.name === pageName);
+}
diff --git a/src/router/a-rewrite/logic/build-manual-url.js b/src/router/a-rewrite/methods/helpers/build-manual-url.js
similarity index 93%
rename from src/router/a-rewrite/logic/build-manual-url.js
rename to src/router/a-rewrite/methods/helpers/build-manual-url.js
index 017816d6b..260b41257 100644
--- a/src/router/a-rewrite/logic/build-manual-url.js
+++ b/src/router/a-rewrite/methods/helpers/build-manual-url.js
@@ -9,7 +9,7 @@ export function buildManualUrl(nextPage) {
     return url;
 }
 
-function buildSearchParams(paramList) {
+export function buildSearchParams(paramList) {
     if (!paramList) {
         return "";
     }
diff --git a/src/router/a-rewrite/logic/consume-referral-info.js b/src/router/a-rewrite/methods/helpers/consume-referral-info.js
similarity index 100%
rename from src/router/a-rewrite/logic/consume-referral-info.js
rename to src/router/a-rewrite/methods/helpers/consume-referral-info.js
diff --git a/src/router/a-rewrite/logic/create-route.js b/src/router/a-rewrite/methods/helpers/create-route.js
similarity index 92%
rename from src/router/a-rewrite/logic/create-route.js
rename to src/router/a-rewrite/methods/helpers/create-route.js
index 44e27b568..a1535f3c8 100644
--- a/src/router/a-rewrite/logic/create-route.js
+++ b/src/router/a-rewrite/methods/helpers/create-route.js
@@ -1,4 +1,4 @@
-import { lazyLoadComponent } from "@/router/a-rewrite/logic/lazy-load-component";
+import { lazyLoadComponent } from "@/router/a-rewrite/methods/helpers/lazy-load-component";
 import { routeData } from "@/router/a-rewrite/constants/routes";
 
 export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
diff --git a/src/router/a-rewrite/logic/get-destination.js b/src/router/a-rewrite/methods/helpers/get-destination.js
similarity index 100%
rename from src/router/a-rewrite/logic/get-destination.js
rename to src/router/a-rewrite/methods/helpers/get-destination.js
diff --git a/src/router/a-rewrite/logic/initialize-from-querystrings.js b/src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
similarity index 100%
rename from src/router/a-rewrite/logic/initialize-from-querystrings.js
rename to src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
diff --git a/src/router/a-rewrite/logic/lazy-load-component.js b/src/router/a-rewrite/methods/helpers/lazy-load-component.js
similarity index 100%
rename from src/router/a-rewrite/logic/lazy-load-component.js
rename to src/router/a-rewrite/methods/helpers/lazy-load-component.js
diff --git a/src/router/a-rewrite/logic/querystring-stash.js b/src/router/a-rewrite/methods/helpers/querystring-stash.js
similarity index 100%
rename from src/router/a-rewrite/logic/querystring-stash.js
rename to src/router/a-rewrite/methods/helpers/querystring-stash.js
diff --git a/src/router/a-rewrite/logic/requires-verified-redirect.js b/src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
similarity index 100%
rename from src/router/a-rewrite/logic/requires-verified-redirect.js
rename to src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
diff --git a/src/router/a-rewrite/logic/run-experiments.js b/src/router/a-rewrite/methods/helpers/run-experiments.js
similarity index 100%
rename from src/router/a-rewrite/logic/run-experiments.js
rename to src/router/a-rewrite/methods/helpers/run-experiments.js
diff --git a/src/router/a-rewrite/logic/save-page-data.js b/src/router/a-rewrite/methods/helpers/save-page-data.js
similarity index 100%
rename from src/router/a-rewrite/logic/save-page-data.js
rename to src/router/a-rewrite/methods/helpers/save-page-data.js
diff --git a/src/router/a-rewrite/methods/navigate-external.js b/src/router/a-rewrite/methods/navigate-external.js
new file mode 100644
index 000000000..622bf1e99
--- /dev/null
+++ b/src/router/a-rewrite/methods/navigate-external.js
@@ -0,0 +1,10 @@
+export function navigateToExternalUrl(url, optionalQuery = {}) {
+    // possibly show some loading screen in the future here.
+    var externalUrl = new URL(url);
+
+    for (const queryKey in optionalQuery) {
+        externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
+    }
+
+    window.location.assign(externalUrl);
+}
diff --git a/src/router/a-rewrite/methods/navigate.js b/src/router/a-rewrite/methods/navigate.js
new file mode 100644
index 000000000..ca8de4784
--- /dev/null
+++ b/src/router/a-rewrite/methods/navigate.js
@@ -0,0 +1,84 @@
+import { saveSession } from "@/helpers/heritage-integration/order-helper";
+import { buildManualUrl } from "@/router/a-rewrite/methods/helpers/build-manual-url";
+import { getDestination } from "@/router/a-rewrite/methods/helpers/get-destination";
+import { savePageData } from "@/router/a-rewrite/methods/helpers/save-page-data";
+import router from "@/router/a-rewrite";
+
+import { bailout } from "@/router/a-rewrite/methods/error";
+
+async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
+    console.log(`Navigate:\n
+        - scenario: ${scenario}\n
+        - currentPage: ${currentPageName}\n
+        - withSaving: ${withSaving}\n
+        - forceTopLevelNav: ${forceTopLevelNav}`);
+    
+    // Check to see if calling page is same as current page.
+    // If not, cancel navigation before it begins.
+    const callingRoute = currentPageName;
+    const actualRoute = router.currentRoute.value.name;
+
+    if (callingRoute !== actualRoute) {
+        return false;
+    }
+
+    const nextPage = getDestination(currentPageName, scenario);
+
+    if (!nextPage) {
+        console.error(
+            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
+        );
+
+        const errorPayload = {
+            cause: "invalid page name",
+            currentPage: currentPageName,
+            nextPage: nextPage?.name,
+        };
+
+        bailout(errorPayload);
+        return;
+    }
+
+    if (withSaving) {
+        await saveSession({ pageNameToLog: nextPage.name });
+    }
+
+    // Some pages require manually setting the next url
+    // to work with iframes.
+    if (forceTopLevelNav) {
+        const newUrl = buildManualUrl(nextPage);
+        window.top.location.href = newUrl;
+        return;
+    }
+
+    // All other pages use router.push
+    router.push({
+        name: nextPage.name,
+        query: nextPage.params ?? {},
+    });
+}
+
+//// -- Aliases: what's actually called
+
+export async function navigateWithoutSaving(scenario, currentPageName) {
+    return await navigate(scenario, currentPageName, false);
+}
+
+export async function navigateWithSaving(scenario, currentPageName) {
+    return await navigate(scenario, currentPageName, true);
+}
+
+export async function navigateWithPageData(scenario, currentPageName, pageData = {}) {
+    const nextPage = getDestination(currentPageName, scenario);
+    await savePageData(nextPage.name, pageData);
+
+    return await navigate(scenario, currentPageName, true);
+}
+
+export async function navigateAndForceTopLevelNavigation(
+    scenario,
+    currentPageName,
+    saving = false
+) {
+    return await navigate(scenario, currentPageName, saving, true);
+}
diff --git a/src/router/a-rewrite/methods/page-prerequisites.js b/src/router/a-rewrite/methods/page-prerequisites.js
new file mode 100644
index 000000000..581ab0354
--- /dev/null
+++ b/src/router/a-rewrite/methods/page-prerequisites.js
@@ -0,0 +1,22 @@
+import { getRoute } from "@/router/a-rewrite/methods/get-route";
+
+export async function checkPagePrerequisites(pageName) {
+    const route = getRoute(pageName);
+
+    if (!route) {
+        return false;
+    }
+
+    let component = route.components;
+
+    // Virtual routes have no component, so skip check.
+    if (!component) {
+        return true;
+    }
+
+    if (component?.default?.methods === undefined) {
+        component = await component?.default();
+    }
+
+    return component?.default?.methods?.arePagePrerequisitesValid();
+}
diff --git a/src/router/a-rewrite/methods/route-logic/auto-route.js b/src/router/a-rewrite/methods/route-logic/auto-route.js
new file mode 100644
index 000000000..a6d55e4fa
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/auto-route.js
@@ -0,0 +1,23 @@
+import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
+import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+
+export async function autoRouteBeforeEnter(to, from) {
+    for (let i = 0; i < autoRouteTable.length; i++) {
+        const testRouteData = autoRouteTable[i];
+
+        const isReady = await checkPagePrerequisites(testRouteData.name);
+
+        if (isReady) {
+            return {
+                name: testRouteData.name,
+                replace: true,
+            };
+        }
+    }
+
+    return {
+        name: FUNNEL_START_PAGE,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/error.js b/src/router/a-rewrite/methods/route-logic/error.js
new file mode 100644
index 000000000..c4bdeb6d5
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/error.js
@@ -0,0 +1,52 @@
+import { globalEvents, globalEventTypes } from "@/constants/events";
+import { storeActions } from "@/constants/store-actions";
+import eventBus from "@/helpers/event-bus/event-bus";
+import baseMixin from "@/mixins/base-mixin";
+import router from "@/router/a-rewrite";
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import store from "@/store";
+
+export async function errorBeforeEnter(to, from) {
+    // If we've already encountered one error, clear session to avoid more.
+    // Otherwise mark that we encoutnered an error here.
+    if (store.getters.applicationUser.hasAlreadyTriggeredError) {
+        return {
+            name: routeData.RESTART.name,
+            replace: true,
+        };
+    } else {
+        await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
+    }
+
+    // Add error event to bus
+    eventBus.addEventToBus(
+        globalEvents.Categories.GLOBAL_ALERT,
+        globalEvents.SubCategories.UNKNOWN_ERROR,
+        {
+            isDismissable: true,
+            messageCopy: "",
+            messageHeadline: "We're sorry, something went wrong.",
+            type: globalEventTypes.Danger,
+        }
+    );
+
+    let nextPage = FUNNEL_START_PAGE.name;
+
+    baseMixin.methods?.ResetExternalParamsAndHideModal();
+
+    if (store.getters.payment?.insuranceCoverage?.isVerified) {
+        nextPage = routeData.VEHICLE_DAMAGE.name;
+    }
+
+    if (from.name === nextPage) {
+        // Router won't load the page if we redirect to the already existing page
+        // Force refresh in this scenario.
+        router.go(0);
+        return false;
+    }
+
+    return {
+        name: nextPage,
+        replace: false,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/heritage.js b/src/router/a-rewrite/methods/route-logic/heritage.js
new file mode 100644
index 000000000..d1a4c41c4
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/heritage.js
@@ -0,0 +1,5 @@
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+
+export async function heritageBeforeEnter(to, from) {
+    await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
+}
diff --git a/src/router/a-rewrite/methods/route-logic/insurance-company.js b/src/router/a-rewrite/methods/route-logic/insurance-company.js
new file mode 100644
index 000000000..18d961854
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/insurance-company.js
@@ -0,0 +1,11 @@
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+
+export async function insuranceCompanyBeforeEnter(to, from) {
+    if (isVerifiedInsurance()) {
+        return {
+            name: routeData.HERITAGE.name,
+            replace: true,
+        };
+    }
+}
diff --git a/src/router/a-rewrite/methods/route-logic/landing.js b/src/router/a-rewrite/methods/route-logic/landing.js
new file mode 100644
index 000000000..b71d7a9db
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/landing.js
@@ -0,0 +1,38 @@
+import router from "@/router/a-rewrite";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { consumeReferralQuerystrings } from "@/router/a-rewrite/methods/helpers/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/a-rewrite/methods/helpers/initialize-from-querystrings";
+import { stashAllQueries } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import store from "@/store";
+
+export async function landingBeforeEnter(to, from) {
+    await initializeFromQueryStrings();
+    // Save querystrings to temporary stash so they can be referred to later.
+    stashAllQueries(to);
+    // Change referral info. For use in local testing for insurance crossover.
+    await consumeReferralQuerystrings();
+
+    // Check for fmgpage parameter
+    const fmgPage = to?.query?.fmgPage;
+    if (fmgPage && router.hasRoute(fmgPage)) {
+        return {
+            name: fmgPage,
+            replace: true,
+        };
+    }
+
+    // If a session is still in memory, go to return-user.
+    if (store.getters.vehicle?.year > 0) {
+        console.log(`trying to redirect!`);
+        return {
+            name: routeData.RETURN_USER.name,
+            replace: true,
+        };
+    }
+
+    // Otherwise, load session and auto-route
+    return {
+        name: routeData.LOAD_SESSION.name,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/load-session.js b/src/router/a-rewrite/methods/route-logic/load-session.js
new file mode 100644
index 000000000..c70eb28d6
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/load-session.js
@@ -0,0 +1,11 @@
+import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+
+export async function loadSessionBeforeEnter(to, from) {
+    const loadSessionResponse = await loadSessionIfPresent(false, to.name);
+
+    return {
+        name: routeData.AUTO_ROUTE.name,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/quote.js b/src/router/a-rewrite/methods/route-logic/quote.js
new file mode 100644
index 000000000..9771b9bbb
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/quote.js
@@ -0,0 +1,20 @@
+import { queryStrings } from "@/constants/query-strings";
+import { storeMutations } from "@/constants/store-mutations";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import store from "@/store";
+
+export async function quoteBeforeEnter(to, from) {
+    if (isVerifiedInsurance()) {
+        return {
+            name: routeData.HERITAGE.name,
+            replace: true,
+        };
+    }
+
+    const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
+
+    if (offerQuote === "true") {
+        store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
+    }
+}
diff --git a/src/router/a-rewrite/methods/route-logic/restart.js b/src/router/a-rewrite/methods/route-logic/restart.js
new file mode 100644
index 000000000..4589999e0
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/restart.js
@@ -0,0 +1,22 @@
+import { storeActions } from "@/constants/store-actions";
+import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import router from "@/router/a-rewrite";
+import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import store from "@/store";
+
+export async function restartBeforeEnter(to, from) {
+    await store.dispatch(storeActions.RESET_STATE);
+    deleteFunnelCookie();
+
+    if (from.name === FUNNEL_START_PAGE.name) {
+        // Router won't load the page if we redirect to the already existing page
+        // Force refresh in this scenario.
+        router.go(0);
+        return false;
+    }
+
+    return {
+        name: FUNNEL_START_PAGE.name,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/vehicle.js b/src/router/a-rewrite/methods/route-logic/vehicle.js
new file mode 100644
index 000000000..ed241d7de
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/vehicle.js
@@ -0,0 +1,21 @@
+import { storeMutations } from "@/constants/store-mutations";
+import { getBoolFromString } from "@/helpers/boolean-helper";
+import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import store from "@/store";
+
+export async function vehicleBeforeEnter(to, from) {
+    // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
+    const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
+    if (hasVehicleChanged) {
+        store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
+    }
+
+    if (isVerifiedInsurance()) {
+        return {
+            name: routeData.VEHICLE_DAMAGE.name,
+            replace: true,
+        };
+    }
+}
diff --git a/src/router/a-rewrite/methods/routes.js b/src/router/a-rewrite/methods/routes.js
new file mode 100644
index 000000000..5cbc8e94e
--- /dev/null
+++ b/src/router/a-rewrite/methods/routes.js
@@ -0,0 +1,46 @@
+import { createRoute, createVirtualRoute } from "@/router/a-rewrite/methods/helpers/create-route";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+
+import { vehicleBeforeEnter } from "@/router/a-rewrite/methods/route-logic/vehicle";
+import { quoteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/quote";
+import { insuranceCompanyBeforeEnter } from "@/router/a-rewrite/methods/route-logic/insurance-company";
+import { landingBeforeEnter } from "@/router/a-rewrite/methods/route-logic/landing";
+import { heritageBeforeEnter } from "@/router/a-rewrite/methods/route-logic/heritage";
+import { loadSessionBeforeEnter } from "@/router/a-rewrite/methods/route-logic/load-session";
+import { autoRouteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/auto-route";
+import { errorBeforeEnter } from "@/router/a-rewrite/methods/route-logic/error";
+import { restartBeforeEnter } from "@/router/a-rewrite/methods/route-logic/restart";
+
+export const routes = [
+    // Non-virtual pages.
+    createRoute(routeData.VEHICLE, vehicleBeforeEnter),
+    createRoute(routeData.VEHICLE_DAMAGE),
+    createRoute(routeData.ESTIMATE),
+    createRoute(routeData.ADDRESS_LOOKUP),
+    createRoute(routeData.VIN_LOOKUP),
+    createRoute(routeData.LICENSE_PLATE_LOOKUP),
+    createRoute(routeData.SERVICE_ZIP),
+    createRoute(routeData.ADDRESS_VEHICLES),
+    createRoute(routeData.VEHICLE_PARTS),
+    createRoute(routeData.PART_QUESTIONS),
+    createRoute(routeData.MOLDING_QUESTIONS),
+    createRoute(routeData.CAPABILITY_QUESTIONS),
+    createRoute(routeData.QUOTE, quoteBeforeEnter),
+    createRoute(routeData.INSURANCE_COMPANY, insuranceCompanyBeforeEnter),
+    createRoute(routeData.SERVICE_LOCATION),
+    createRoute(routeData.SCHEDULE),
+    createRoute(routeData.CUSTOMER_DETAILS),
+    createRoute(routeData.PAYMENT_METHOD),
+    createRoute(routeData.PAYMENT),
+    createRoute(routeData.PAYMENT_PIA_RETURN),
+    createRoute(routeData.CONFIRMATION),
+    createRoute(routeData.RETURN_USER),
+
+    // Virtual pages (resolve to a non-virtual page.)
+    createVirtualRoute(routeData.LANDING, landingBeforeEnter),
+    createVirtualRoute(routeData.HERITAGE, heritageBeforeEnter),
+    createVirtualRoute(routeData.LOAD_SESSION, loadSessionBeforeEnter),
+    createVirtualRoute(routeData.AUTO_ROUTE, autoRouteBeforeEnter),
+    createVirtualRoute(routeData.ERROR, errorBeforeEnter),
+    createVirtualRoute(routeData.RESTART, restartBeforeEnter),
+];

From fc459f89cf929659fb03c938737a712cca8a7978 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Tue, 6 May 2025 14:27:06 -0400
Subject: [PATCH 10/64] CASH-535 - Added null check

---
 src/layouts/quote/quote.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index c4ae1ff4c..57c0178e3 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -791,7 +791,7 @@ export default {
                 const availablePackageNames = this.$refs.servicePackage?.servicePackageAnswers;
                 var priceLabel = "";
 
-                if (availablePackageNames.length > 1 || availablePackageNames.length == 1) {
+                if (availablePackageNames?.length > 1 || availablePackageNames?.length == 1) {
                     var tier = availablePackageNames[0];
                     if (tier) {
                         let lineItemsToPrice = this.availableLineItems;
@@ -820,8 +820,8 @@ export default {
                         priceLabel = price.toFixed(2);
                     }
                 }
-                const subTotalLabel = this.Variables.CASH_SUBTOTAL;
-                this.pushVariableToDataLayer({ [subTotalLabel]: priceLabel });
+                const subTotalLabel = this.Variables?.CASH_SUBTOTAL;
+                this.pushVariableToDataLayer?.({ [subTotalLabel]: priceLabel });
             });
         },
         async skip(insuranceSelection, packageSelection) {

From 63c9f8e184c8c235856979d910436adeacfe0dbe Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 6 May 2025 15:42:14 -0400
Subject: [PATCH 11/64] CASH-313 Chat style updates.

---
 .../salesforce-webchat/salesforce-webchat.vue | 164 +++++++++++-------
 1 file changed, 97 insertions(+), 67 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 975c639a8..84a06d241 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -65,77 +65,107 @@ export default {
     }
 }
 
-.dockableContainer.showDockableContainer .sidebarBody {
-    button {
-        background: #0070d1;
-        color: #fff;
-        &:hover {
-            background: #06577c !important;
+.dockableContainer {
+    &.showDockableContainer {
+        font-family: AvertaRegular;
+        color: #4d5151;
+        .sidebarBody {
+            button {
+                background: #0070d1;
+                color: #fff;
+                &:hover {
+                    background: #06577c !important;
+                }
+            }
+            .form-element__help {
+                color: #db0020;
+            }
+            .embeddedServiceSidebarFormField {
+                .uiInput {
+                    .uiLabel-left {
+                        color: #4d5151;
+                    }
+                }
+            }
+            .embeddedServiceSidebarButton {
+                &.uiButton--inverse {
+                    .label {
+                        color: #fff;
+                        text-decoration: underline;
+                    }
+                    &:not(:disabled):focus {
+                        background-color: #0070d1;
+                    }
+                }
+            }
+            .embeddedServiceLiveAgentStateChatAvatar {
+                &.isLightningOutContext {
+                    .agentIconColor0 {
+                        background-color: #0070d1;
+                    }
+                }
+            }
+            .embeddedServiceLiveAgentStateChatInputFooter {
+                .footerMenuWrapper {
+                    .footer-menu-items {
+                        .slds-dropdown__item {
+                            > a {
+                                padding-left: 0;
+                                max-width: 100%;
+                                display: flex;
+                                justify-content: center;
+                            }
+                        }
+                    }
+                }
+            }
+            .embeddedServiceLiveAgentStateChatInputFooter {
+                .footerMenuWrapper {
+                    .footer-menu-items {
+                        a {
+                            margin: 0 auto;
+                        }
+                    }
+                }
+            }
+        }
+        .chatHeaderBranding {
+            background-color: #0070d1;
+        }
+        span {
+            &.required {
+                color: #db0020;
+            }
         }
     }
-    .embeddedServiceSidebarFormField .uiInput input {
-        border: 1px solid #8e9292;
+}
+.embeddedServiceHelpButton {
+    .helpButton {
+        .uiButton {
+            background-color: #0070d1 !important;
+        }
     }
-    .embeddedServiceSidebarButton.uiButton--inverse .label {
-        color: #fff;
-        text-decoration: underline;
-    }
-    .embeddedServiceLiveAgentStateChatAvatar.isLightningOutContext .agentIconColor0 {
-        background-color: #0070d1;
-    }
-    .embeddedServiceSidebarFormField .uiInput .uiLabel-left {
-        font-family: AvertaRegular;
-        color: #727676;
-    }
-    .form-element__help {
-        color: #db0020;
-    }
-    .embeddedServiceSidebarFormField .uiInput input {
-        border: 1px solid #06577c;
-    }
-    .embeddedServiceLiveAgentStateChatInputFooter
-        .footerMenuWrapper
-        .footer-menu-items
-        .slds-dropdown__item
-        > a {
-        padding-left: 0;
-        max-width: 100%;
-        display: flex;
-        justify-content: center;
-    }
-    .embeddedServiceLiveAgentStateChatInputFooter .footerMenuWrapper .footer-menu-items a {
-        margin: 0 auto;
-    }
-    .embeddedServiceSidebarButton.uiButton--inverse:not(:disabled):focus {
-        background-color: #0070d1;
+    .embeddedServiceIcon {
+        display: inline-block!important;
     }
 }
-
-.embeddedServiceHelpButton .helpButton .uiButton {
-    background-color: #0070d1 !important;
-}
-
-.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar
-    .embeddedServiceSidebarMinimizedDefaultUI.helpButton,
-.modalContainer.sidebarMinimized.layout-docked.embeddedServiceSidebar
-    .sidebarHeader.minimizedContainer.embeddedServiceSidebarMinimizedDefaultUI {
-    background-color: #0070d1;
-    border: 1px solid #0070d1;
-}
-
-.dockableContainer.showDockableContainer .chatHeaderBranding {
-    background-color: #0070d1;
-}
-
-.dockableContainer.showDockableContainer {
-    font-family: AvertaRegular;
-    color: #727676;
-}
-
-.dockableContainer.showDockableContainer span.required {
-    color: #db0020;
-}
-
-.dockableContainer.showDockableContainer .sidebarBody button:hover {
+.modalContainer {
+    &.sidebarMinimized {
+        &.layout-docted {
+            &.embeddedServiceSidebar {
+                .embeddedServiceSidebarMinimizedDefaultUI {
+                    .helpButton,
+                    .sidebarHeader {
+                        &.minimizedContainer {
+                            .embeddedServiceSidebarMinimizedDefaultUI {
+                                background-color: #0070d1;
+                                border: 1px solid #0070d1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 </style>

From 30b290b4e92303ebe0b4a3ca32942c4ee52d5b8a Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 6 May 2025 15:49:45 -0400
Subject: [PATCH 12/64] Format code.

---
 .../salesforce-webchat/salesforce-webchat.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 84a06d241..9022553a7 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -146,7 +146,7 @@ export default {
         }
     }
     .embeddedServiceIcon {
-        display: inline-block!important;
+        display: inline-block !important;
     }
 }
 .modalContainer {

From 54cdb6f2cf6e4848864e79d9329b8e4d86a4e300 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 7 May 2025 08:54:12 -0400
Subject: [PATCH 13/64] CASH-552: update selected date after second api date
 load

---
 src/layouts/schedule/schedule.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b1e04a734..ae05b9358 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -375,6 +375,10 @@ export default {
                     setTimeout(() => {
                         this.$refs.datePicker.showAnotherMonth().then((moreSelectableDatesData) => {
                             this.selectableDatesData = moreSelectableDatesData;
+                            if (selectableDatesData?.days?.length > 0) {
+                                this.selectedDate = selectableDatesData.days[0].date;
+                            }
+
                             this.setDisplayWaitList();
                         });
                     }, 50);

From e6910c574956e0828fee3a74304ded9fe886ae0f Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 7 May 2025 09:53:52 -0400
Subject: [PATCH 14/64] CASH-313 style updates.

---
 .../salesforce-webchat/salesforce-webchat.vue | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 9022553a7..8cffc143f 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -68,40 +68,40 @@ export default {
 .dockableContainer {
     &.showDockableContainer {
         font-family: AvertaRegular;
-        color: #4d5151;
+        color: $gray-600;
         .sidebarBody {
             button {
-                background: #0070d1;
-                color: #fff;
+                background: $blue;
+                color: $white;
                 &:hover {
-                    background: #06577c !important;
+                    background: $blue-700 !important;
                 }
             }
             .form-element__help {
-                color: #db0020;
+                color: $red;
             }
             .embeddedServiceSidebarFormField {
                 .uiInput {
                     .uiLabel-left {
-                        color: #4d5151;
+                        color: $gray-600;
                     }
                 }
             }
             .embeddedServiceSidebarButton {
                 &.uiButton--inverse {
                     .label {
-                        color: #fff;
+                        color: $white;
                         text-decoration: underline;
                     }
                     &:not(:disabled):focus {
-                        background-color: #0070d1;
+                        background-color: $blue;
                     }
                 }
             }
             .embeddedServiceLiveAgentStateChatAvatar {
                 &.isLightningOutContext {
                     .agentIconColor0 {
-                        background-color: #0070d1;
+                        background-color: $blue;
                     }
                 }
             }
@@ -130,11 +130,11 @@ export default {
             }
         }
         .chatHeaderBranding {
-            background-color: #0070d1;
+            background-color: $blue;
         }
         span {
             &.required {
-                color: #db0020;
+                color: $red;
             }
         }
     }
@@ -142,7 +142,7 @@ export default {
 .embeddedServiceHelpButton {
     .helpButton {
         .uiButton {
-            background-color: #0070d1 !important;
+            background-color: $blue !important;
         }
     }
     .embeddedServiceIcon {
@@ -158,8 +158,8 @@ export default {
                     .sidebarHeader {
                         &.minimizedContainer {
                             .embeddedServiceSidebarMinimizedDefaultUI {
-                                background-color: #0070d1;
-                                border: 1px solid #0070d1;
+                                background-color: $blue;
+                                border: 1px solid $blue;
                             }
                         }
                     }

From dd1852d4c3c50306655027564f41bcdff1e8562b Mon Sep 17 00:00:00 2001
From: Matt Caimi <Matt.Caimi@safelite.com>
Date: Wed, 7 May 2025 10:15:45 -0400
Subject: [PATCH 15/64] CASH-376 fix for error message appearing when address
 modal is open

---
 src/digital-components/modal/modal.vue             |  2 ++
 .../mobile-location-modal-questions.vue            |  2 ++
 .../service-location/service-location.spec.js      | 14 +++++++-------
 src/layouts/service-location/service-location.vue  | 11 +++++++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 74cfc0964..7b89b7e57 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -119,12 +119,14 @@ export default {
         },
         onModalOpened() {
             this.onModalOpenedCallback?.();
+            this.$emit("isModalOpened", true);
         },
         onModalClosed() {
             this.resetButtonStyle();
             this.onModalClosedCallback?.();
             if (this.suppressPageScroll)
                 document.querySelector("body").classList.remove("prevent-modal-scroll");
+            this.$emit("isModalOpened", false);
         },
         openModal() {
             if (this.suppressPageScroll)
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 ac597c72b..c72f7d4dd 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
@@ -97,6 +97,7 @@ export default {
         "updated-contains-military-base",
         "updated-bill-to-account-number",
         "setMobileLocationAndProceed",
+        "updated-modal-opened",
     ],
     data() {
         return {
@@ -228,6 +229,7 @@ export default {
         },
         setModalStatus(isOpened) {
             this.isModalOpened = isOpened;
+            this.$emit("updated-modal-opened", isOpened);
         },
         closeModal() {
             this.modal.closeModal();
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 3b20c69f0..3a499b2ca 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -343,7 +343,7 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                isMobileSelected: true,
+                isMobileSelectedAndModalClosed: true,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -356,7 +356,7 @@ describe("service-location.vue", () => {
                     zipCode: "61606",
                 },
                 isVehicleProtected: null,
-                isMobileSelected: false,
+                isMobileSelectedAndModalClosed: false,
             };
 
             // Act
@@ -459,7 +459,7 @@ describe("service-location.vue", () => {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                isMobileSelected: false,
+                isMobileSelectedAndModalClosed: false,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
             const newMobileLocationQuestions = {
@@ -471,7 +471,7 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                isMobileSelected: true,
+                isMobileSelectedAndModalClosed: true,
             };
 
             wrapper.vm.closeModalAction = jest.fn();
@@ -521,7 +521,7 @@ describe("service-location.vue", () => {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                isMobileSelected: false,
+                isMobileSelectedAndModalClosed: false,
                 mobileFeePart: null,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
@@ -535,7 +535,7 @@ describe("service-location.vue", () => {
                     zipCode: "43081",
                 },
                 isVehicleProtected: true,
-                isMobileSelected: true,
+                isMobileSelectedAndModalClosed: true,
                 mobileFeePart: null,
             };
 
@@ -599,7 +599,7 @@ describe("service-location.vue", () => {
                     zipCode: "43081",
                 },
                 isVehicleProtected: "YesAnswer",
-                isMobileSelected: true,
+                isMobileSelectedAndModalClosed: true,
             };
 
             wrapper.vm.closeModalAction = jest.fn();
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 88cedcee2..ef27cbbb8 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -98,6 +98,7 @@
                         @updated-serviceability="setServiceabilityDetails"
                         @updated-contains-military-base="setContainsMilitaryBase"
                         @updated-mobile-ctu="setCtuForMobile"
+                        @updated-modal-opened="setMobileLocationModalOpened"
                         validationRules="mobile-location-required"
                         ref="mobileLocationQuestions"
                         linkWidgetName="MobileLocationLinkWidget"
@@ -172,7 +173,7 @@ const MOBILE_FEE_PART_TYPE = "MOBILE FEE";
 // DEFINE VALIDATION RULES
 defineRule("mobile-location-required", (value) => {
     if (
-        value.isMobileSelected &&
+        value.isMobileSelectedAndModalClosed &&
         (!value.addressQuestions.streetAddress ||
             !value.addressQuestions.city ||
             !value.addressQuestions.state ||
@@ -211,6 +212,7 @@ export default {
             billToAccountNumber: null,
             shopProviderData: null,
             navigatingForward: false,
+            mobileLocationModalOpened: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -301,7 +303,9 @@ export default {
                         zipCode: this.zipCode,
                     },
                     isVehicleProtected: this.isVehicleProtected,
-                    isMobileSelected: this.selectedAppointmentType === "Mobile",
+                    isMobileSelectedAndModalClosed:
+                        this.selectedAppointmentType === "Mobile" &&
+                        !this.mobileLocationModalOpened,
                 };
             },
         },
@@ -502,6 +506,9 @@ export default {
         setRecycleFeePart(recycleFeePart) {
             this.recycleFeePart = recycleFeePart;
         },
+        setMobileLocationModalOpened(isModalOpened) {
+            this.mobileLocationModalOpened = isModalOpened;
+        },
         //creating async function as the computed property can not directly handle asynchronous operations or promises.
         async setMobileLocationQuestions(newValue) {
             var newZipCode = newValue.addressQuestions.zipCode;

From 572f8de5bb8298225ff79e4212406e3297017216 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 7 May 2025 11:44:55 -0400
Subject: [PATCH 16/64] Unplug Legacy Router

---
 src/constants/application-config.js           |   1 +
 src/digital-components/modal/modal.vue        |   8 +-
 src/fmg-components/nav-bar/nav-bar.vue        |   9 +-
 src/global-methods.js                         |   2 +-
 .../heritage-integration/navigation-helper.js | 102 --
 src/helpers/unit-test-helper.js               |   6 +-
 src/layouts/address-lookup/address-lookup.vue |   5 +-
 .../address-vehicles/address-vehicles.vue     |   7 +-
 .../capability-questions.vue                  |   6 +-
 src/layouts/estimate/estimate.vue             |   2 +-
 .../license-plate-lookup.vue                  |   7 +-
 .../molding-questions/molding-questions.vue   |   6 +-
 src/layouts/part-questions/part-questions.vue |   6 +-
 src/layouts/payment-method/payment-method.vue |   3 +-
 .../payment-pia-return/payment-pia-return.vue |   1 -
 src/layouts/payment/payment.vue               |   8 +-
 src/layouts/quote/quote.vue                   |   8 +-
 src/layouts/service-zip/service-zip.vue       |   6 +-
 src/layouts/vehicle-damage/vehicle-damage.vue |   1 -
 src/layouts/vehicle-parts/vehicle-parts.vue   |   6 +-
 src/layouts/vehicle/vehicle.vue               |   2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |   9 +-
 src/main.js                                   |   2 +-
 src/mixins/analytics-mixin.js                 |   5 +-
 src/mixins/base-mixin.js                      |   6 +-
 src/mixins/vehicle-questions-mixin.js         |  38 +-
 src/router/a-rewrite/index.js                 |  38 -
 .../constants/auto-route-table.js             |   0
 .../constants/externalUrl-values.js           |   0
 .../constants/navigation-scenarios.js         |   0
 .../{a-rewrite => }/constants/route-prefix.js |   0
 .../{a-rewrite => }/constants/routes.js       |   0
 .../constants/routing-table.js                |   6 +-
 .../dynamic-routing/component-loader.js       |   3 -
 src/router/index.js                           | 947 +-----------------
 .../{a-rewrite => }/methods/after-each.js     |   0
 .../{a-rewrite => }/methods/before-each.js    |  10 +-
 src/router/{a-rewrite => }/methods/error.js   |   4 +-
 .../{a-rewrite => }/methods/get-route.js      |   2 +-
 .../methods/helpers/build-manual-url.js       |   2 +-
 .../methods/helpers/consume-referral-info.js  |   0
 .../methods/helpers/create-route.js           |   4 +-
 .../methods/helpers/get-destination.js        |   2 +-
 .../helpers/initialize-from-querystrings.js   |   0
 .../methods/helpers/lazy-load-component.js    |   0
 .../methods/helpers/querystring-stash.js      |   0
 .../helpers/requires-verified-redirect.js     |   0
 .../methods/helpers/run-experiments.js        |   0
 .../methods/helpers/save-page-data.js         |   0
 .../methods/navigate-external.js              |   0
 .../{a-rewrite => }/methods/navigate.js       |  16 +-
 .../methods/page-prerequisites.js             |   2 +-
 .../methods/route-logic/auto-route.js         |   6 +-
 .../methods/route-logic/error.js              |   4 +-
 .../methods/route-logic/heritage.js           |   0
 .../methods/route-logic/insurance-company.js  |   4 +-
 .../methods/route-logic/landing.js            |  10 +-
 .../methods/route-logic/load-session.js       |   2 +-
 .../methods/route-logic/quote.js              |   4 +-
 .../methods/route-logic/restart.js            |   4 +-
 .../methods/route-logic/vehicle.js            |   4 +-
 src/router/{a-rewrite => }/methods/routes.js  |  22 +-
 src/router/methods/send-to-return-user.js     |  11 +
 .../router-constants/externalUrl-values.js    |   6 -
 src/router/router-constants/fmgPage-values.js |  32 -
 .../router-constants/navigation-scenarios.js  |  59 --
 src/router/router-constants/router-params.js  |   6 -
 src/router/router-constants/routing-table.js  | 546 ----------
 src/store/index.js                            |  38 +-
 69 files changed, 171 insertions(+), 1885 deletions(-)
 delete mode 100644 src/router/a-rewrite/index.js
 rename src/router/{a-rewrite => }/constants/auto-route-table.js (100%)
 rename src/router/{a-rewrite => }/constants/externalUrl-values.js (100%)
 rename src/router/{a-rewrite => }/constants/navigation-scenarios.js (100%)
 rename src/router/{a-rewrite => }/constants/route-prefix.js (100%)
 rename src/router/{a-rewrite => }/constants/routes.js (100%)
 rename src/router/{a-rewrite => }/constants/routing-table.js (99%)
 delete mode 100644 src/router/dynamic-routing/component-loader.js
 rename src/router/{a-rewrite => }/methods/after-each.js (100%)
 rename src/router/{a-rewrite => }/methods/before-each.js (86%)
 rename src/router/{a-rewrite => }/methods/error.js (78%)
 rename src/router/{a-rewrite => }/methods/get-route.js (71%)
 rename src/router/{a-rewrite => }/methods/helpers/build-manual-url.js (88%)
 rename src/router/{a-rewrite => }/methods/helpers/consume-referral-info.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/create-route.js (87%)
 rename src/router/{a-rewrite => }/methods/helpers/get-destination.js (85%)
 rename src/router/{a-rewrite => }/methods/helpers/initialize-from-querystrings.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/lazy-load-component.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/querystring-stash.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/requires-verified-redirect.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/run-experiments.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/save-page-data.js (100%)
 rename src/router/{a-rewrite => }/methods/navigate-external.js (100%)
 rename src/router/{a-rewrite => }/methods/navigate.js (79%)
 rename src/router/{a-rewrite => }/methods/page-prerequisites.js (87%)
 rename src/router/{a-rewrite => }/methods/route-logic/auto-route.js (65%)
 rename src/router/{a-rewrite => }/methods/route-logic/error.js (92%)
 rename src/router/{a-rewrite => }/methods/route-logic/heritage.js (100%)
 rename src/router/{a-rewrite => }/methods/route-logic/insurance-company.js (54%)
 rename src/router/{a-rewrite => }/methods/route-logic/landing.js (69%)
 rename src/router/{a-rewrite => }/methods/route-logic/load-session.js (82%)
 rename src/router/{a-rewrite => }/methods/route-logic/quote.js (75%)
 rename src/router/{a-rewrite => }/methods/route-logic/restart.js (84%)
 rename src/router/{a-rewrite => }/methods/route-logic/vehicle.js (81%)
 rename src/router/{a-rewrite => }/methods/routes.js (60%)
 create mode 100644 src/router/methods/send-to-return-user.js
 delete mode 100644 src/router/router-constants/externalUrl-values.js
 delete mode 100644 src/router/router-constants/fmgPage-values.js
 delete mode 100644 src/router/router-constants/navigation-scenarios.js
 delete mode 100644 src/router/router-constants/router-params.js
 delete mode 100644 src/router/router-constants/routing-table.js

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index a03e5f010..788de3fd7 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -6,6 +6,7 @@ const applicationConfig = {
     COOKIE_PATH: "/",
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
+    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
     APPLICATION_NAME: "FixMyGlass",
     ANALYTICS_APPLICATION_NAME: "FixMyGlassNextGen",
     APPLICATION_ABBREVIATION: "fmg",
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 74cfc0964..6ba5f576b 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -46,9 +46,7 @@
 </template>
 
 <script>
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
@@ -91,11 +89,7 @@ export default {
             const validationResult = await this.validate();
             if (validationResult.valid) {
                 if (analyticsMixin.methods.sessionExpired()) {
-                    analyticsMixin.methods.initSession();
-                    router.push({
-                        path: "/",
-                        query: { fmgPage: fmgPageValues.RETURN_USER },
-                    });
+                    this.$router.sendToReturnUser();
                 } else {
                     this.$emit("footer-button-event");
                 }
diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index eaf37047c..aed1edb19 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -45,9 +45,7 @@
 <script>
 import textLink from "@/ux-components/text-link/text-link";
 import buttonMain from "@/ux-components/button-main/button-main";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
 
 export default {
     name: "navbar",
@@ -113,12 +111,7 @@ export default {
             }
         },
         routeReturnUser() {
-            analyticsMixin.methods.initSession();
-
-            router.push({
-                path: "/",
-                query: { fmgPage: fmgPageValues.RETURN_USER },
-            });
+            this.$router.sendToReturnUser();
         },
     },
 };
diff --git a/src/global-methods.js b/src/global-methods.js
index 784ba6782..e90843bdc 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import router from "@/router/a-rewrite";
+import router from "@/router";
 import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 2fc557a16..ca547b980 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -1,11 +1,7 @@
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeActions } from "@/constants/store-actions.js";
-import { settleAllPromises } from "@/helpers/layout-helper";
 import experimentMixin from "@/mixins/experiment-mixin";
 import { experimentSettings } from "@/constants/experiments";
 import { includesWindshieldReplacement } from "@/helpers/damage-helper";
@@ -13,103 +9,9 @@ import { applicationConfig } from "@/constants/application-config.js";
 import store from "@/store";
 import router from "@/router";
 
-export async function getPageToRouteExistingOrderTo(toRoute = {}) {
-    const fmgQueryPage = toRoute.query[queryStrings.FMG_PAGE];
-    const hasFmgQueryPage = !!fmgQueryPage;
-
-    if (hasFmgQueryPage) {
-        return await getDirectNavigation(toRoute);
-    } else {
-        return await getImplicitNavigation(toRoute);
-    }
-}
-
-/*
- * Send the user to the specified page, except in specific scenarios.
- */
-export async function getDirectNavigation(toRoute) {
-    const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE];
-
-    // Verified insurance users need to be routed around some pages.  Same goes for C&C unverified 6 digit referrals
-    // vehicle -> vehicle-damage
-    // quote -> vin-lookup/estimate
-    // insurance-company -> vin-lookup/estimate
-    if (
-        store.getters.payment?.insuranceCoverage?.isVerified ||
-        store.getters.order?.referralNumber?.length === 6
-    ) {
-        if (fmgPageValue === fmgPageValues.VEHICLE) {
-            return fmgPageValues.VEHICLE_DAMAGE;
-        }
-
-        if (fmgPageValue === fmgPageValues.QUOTE) {
-            const skipVin = await skipVinLookup();
-
-            if (skipVin || !store.getters.vehicle?.vin) {
-                return fmgPageValues.ESTIMATE;
-            } else {
-                return fmgPageValues.VIN_LOOKUP;
-            }
-        }
-    }
-
-    // Otherwise, respect navigation from query string.
-    return fmgPageValue;
-}
-
-/*
- * Determine which page in the flow the user should be sent to, based on their current order.
- * General strategy: run through pages in reverse order, and select first where prerequisites are valid.
- * QUOTE is the latest page to send to.
- */
-export async function getImplicitNavigation(toRoute) {
-    const vehicleDamageComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_DAMAGE);
-    const estimateComponent = await getLazyLoadedComponent(fmgPageValues.ESTIMATE);
-    const vinLookupComponent = await getLazyLoadedComponent(fmgPageValues.VIN_LOOKUP);
-    const partQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.PART_QUESTIONS);
-    const vehiclePartsComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_PARTS);
-    const moldingQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.MOLDING_QUESTIONS);
-    const capabilityQuestionsComponent = await getLazyLoadedComponent(
-        fmgPageValues.CAPABILITY_QUESTIONS
-    );
-    const quoteComponent = await getLazyLoadedComponent(fmgPageValues.QUOTE);
-
-    const skipVin = await skipVinLookup();
-
-    if (store.getters.order.payment.insuranceCoverage?.isVerified) {
-        return fmgPageValues.HERITAGE;
-    }
-
-    if (quoteComponent.methods.arePagePrerequisitesValid()) {
-        // Do not send to quote if verified insurance user.
-        if (store.getters.requiresVerifiedRedirecting) {
-            return fmgPageValues.HERITAGE;
-        } else {
-            return fmgPageValues.QUOTE;
-        }
-    } else if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.CAPABILITY_QUESTIONS;
-    } else if (moldingQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.MOLDING_QUESTIONS;
-    } else if (vehiclePartsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.VEHICLE_PARTS;
-    } else if (partQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.PART_QUESTIONS;
-    } else if (vinLookupComponent.methods.arePagePrerequisitesValid() && !skipVin) {
-        return fmgPageValues.VIN_LOOKUP;
-    } else if (estimateComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.ESTIMATE;
-    } else if (vehicleDamageComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.VEHICLE_DAMAGE;
-    } else {
-        return fmgPageValues.VEHICLE;
-    }
-}
-
 /*
     Used to navigate to the heritage funnel with the correct query string and url.
 */
-
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
     const log = getQuerystringParameter(queryStrings.LOG);
     if (log === "true") {
@@ -191,7 +93,3 @@ export async function skipVinLookupNotRepair() {
         experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
     );
 }
-
-async function getLazyLoadedComponent(pageName) {
-    return (await lazyLoadComponent(pageName)()).default;
-}
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 7c3c9ed4e..540f607b0 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -1,8 +1,7 @@
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios.js";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin";
@@ -19,7 +18,6 @@ import {
     ValueToLogTypes,
 } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
-import { routerParams } from "@/router/router-constants/router-params";
 
 // Common methods
 export function getMountOptions(mockData) {
@@ -60,7 +58,6 @@ export function getMountOptions(mockData) {
     mocks.storeMutations = storeMutations;
     mocks.navigationScenarios = navigationScenarios;
     mocks.vehicleCategories = vehicleCategories;
-    mocks.fmgPageValues = fmgPageValues;
     mocks.analyticsPageEvents = analyticsPageEvents;
     mocks.GaCategories = GaCategories;
     mocks.GaActions = GaActions;
@@ -68,7 +65,6 @@ export function getMountOptions(mockData) {
     mocks.GaEvents = GaEvents;
     mocks.ValueToLogTypes = ValueToLogTypes;
     mocks.queryStrings = queryStrings;
-    mocks.routerParams = routerParams;
 
     // Mock $store and $router when accessing this.$store/$router
     mocks.$store = mockData.store;
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 6a82ea26c..91aed6f1a 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -118,12 +118,11 @@ import { errorMessages } from "@/constants/error-messages";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
-import { routerParams } from "@/router/router-constants/router-params";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 
 // DEFINE VALIDATION RULES - Note: Additional rules are defined in Customer Questions and Address Questions components
 defineRule("service-zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -412,7 +411,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.customerQuestions.emailOrSms },
                 },
                 false
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index e094f6147..baffb70a6 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -60,7 +60,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { errorMessages } from "@/constants/error-messages";
 import { required } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
@@ -71,7 +71,6 @@ import {
     getRouterLinkRouteFromCopy,
     getRouterLinkDisplayTextFromCopy,
 } from "@/helpers/cms-content-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 
 // DEFINE VALIDATION RULES
@@ -144,7 +143,7 @@ export default {
             return mappedData;
         },
         VehiclesFromApi() {
-            return store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES);
+            return store.getters.pageData(routeData.ADDRESS_VEHICLES.name);
         },
         selectedVehicle() {
             return this.VehiclesForQuestions.find(({ vin }) => vin === this.selectedVehicleVin);
@@ -159,7 +158,7 @@ export default {
             if (
                 store.getters.order.vehicle.carId &&
                 store.getters.order.serviceLocation.zipCode &&
-                store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES)
+                store.getters.pageData(routeData.ADDRESS_VEHICLES.name)
             ) {
                 return true;
             }
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index e04f0f18e..c4f5df92c 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -97,7 +97,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)
+            return this.$store.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)
                 .partsOrQuestions;
         },
     },
@@ -107,7 +107,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const capabilityQuestionsPageData = store.getters.pageData(
-                fmgPageValues.CAPABILITY_QUESTIONS
+                routeData.CAPABILITY_QUESTIONS.name
             );
             return (
                 // has capabilityQuestions array and has glassName not null
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 66d1544d9..811cd1a86 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 673116965..cab786b4a 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -112,14 +112,13 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
 import { errorMessages } from "@/constants/error-messages";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -367,7 +366,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 82b1e1619..a7f4900de 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -112,7 +112,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS).partsOrQuestions;
+            return this.$store.getters.pageData(routeData.MOLDING_QUESTIONS.name).partsOrQuestions;
         },
     },
     mounted() {
@@ -121,7 +121,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const moldingQuestionsFromPageData = store.getters.pageData(
-                fmgPageValues.MOLDING_QUESTIONS
+                routeData.MOLDING_QUESTIONS.name
             );
             return (
                 // has childPartQuestions array and has glassName not null
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 89568fa37..5456d868f 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -114,7 +114,7 @@ export default {
             return this.getCmsContent("AlertPartsQuestions", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS).partsOrQuestions;
+            return this.$store.getters.pageData(routeData.PART_QUESTIONS.name).partsOrQuestions;
         },
     },
     mounted() {
@@ -122,7 +122,7 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
+            const partQuestionsFromPageData = store.getters.pageData(routeData.PART_QUESTIONS.name);
             return (
                 // has .partQuestions array and has glassName not null
                 partQuestionsFromPageData?.partsOrQuestions?.some((part) => part?.glassName) &&
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 51a3ffd5d..e2debfe4a 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -147,7 +147,6 @@ import {
     getNewlyInactivatedPromos,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
-import { routerParams } from "@/router/router-constants/router-params";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 
@@ -168,7 +167,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index b39726948..b1ec2b120 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -13,7 +13,6 @@ import store from "@/store";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form } from "vee-validate";
 import { paymentMethods } from "@/constants/payment-method-constants";
-import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import {
     getDisplayAmountDue,
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index f2bdb6733..40d772dbb 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -213,7 +213,6 @@ import alert from "@/ux-components/alert/alert";
 
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { applicationConfig } from "@/constants/application-config";
@@ -231,7 +230,6 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import iframeResize from "../../../node_modules/iframe-resizer/js/iframeResizer.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import { coverageStatus } from "@/constants/insurance";
 import { getBoolFromString } from "@/helpers/boolean-helper.js";
 import {
@@ -245,7 +243,7 @@ export default {
     name: "payment",
     data() {
         return {
-            checkoutUrl: externalUrls.SAFELITE_HOP,
+            checkoutUrl: applicationConfig.SAFELITE_HOP,
             piaResponseUrl: applicationConfig.PIA_RESPONSE_URL,
             piaCancelUrl: applicationConfig.PIA_CANCEL_URL,
             piaErrorUrl: applicationConfig.PIA_ERROR_URL,
@@ -693,9 +691,7 @@ export default {
                 console.log("error: response from submit work order(payment pg):" + error.message);
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: true }
+                    this.pageName
                 );
                 this.$refs.loadingModal.isModalVisible = false;
                 return;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 2009384ee..cf4c8c84e 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -167,8 +167,8 @@ import {
     getDeviceIdValue,
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -281,7 +281,7 @@ export default {
         const emailFromStore = store.getters.order.customer.emailAddress;
         const isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
         const isPopupSkipped =
-            store.getters.pageData(fmgPageValues.QUOTE)?.saveProgressPopupSkipped === true;
+            store.getters.pageData(routeData.QUOTE.name)?.saveProgressPopupSkipped === true;
         const showSaveProgressPopup = !(isEmailInStoreOnPageLoad || isPopupSkipped);
         const showSaveProgressModal = isEmailInStoreOnPageLoad ? false : true;
         const shouldSkipToInsurance =
@@ -683,7 +683,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.QUOTE,
+                    page: routeData.QUOTE.name,
                     data: { saveProgressPopupSkipped: true },
                 },
                 false
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 6e0bccda6..819fa4273 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -95,8 +95,8 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -243,7 +243,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 488ad1eb4..1106f7324 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -97,7 +97,6 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsCms } from "@/constants/damage-locations-cms.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 4298b74cb..fcea707eb 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -69,7 +69,7 @@ import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-ques
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form } from "vee-validate";
 import store from "@/store";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
@@ -162,7 +162,7 @@ export default {
         },
 
         PartsFromApi() {
-            return this.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            return this.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
         },
 
         RefPrefix() {
@@ -172,7 +172,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
-            const vehiclePartsFromPageData = store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            const vehiclePartsFromPageData = store.getters.pageData(routeData.VEHICLE_PARTS.name);
             return (
                 store.getters.damage.isRepair != null &&
                 vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 8686be85b..174c76530 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -113,7 +113,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import {
     consumeQueryFromStash,
     peekQueryFromStash,
-} from "@/router/a-rewrite/methods/helpers/querystring-stash";
+} from "@/router/methods/helpers/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 277e176f5..05f6fdbd7 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -155,12 +155,11 @@ import {
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -391,7 +390,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: fmgPageValues.EMAIL_SMS_PAGES,
+                        page: routeData.SERVICE_ZIP.name,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
@@ -454,7 +453,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: fmgPageValues.EMAIL_SMS_PAGES,
+                        page: routeData.SERVICE_ZIP.name,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
diff --git a/src/main.js b/src/main.js
index 5b823125b..5d655db85 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import LoadScript from "vue-plugin-load-script";
 import Maska from "maska";
 import App from "./App.vue";
-import router from "./router/a-rewrite";
+import router from "@/router";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 import analyticsMixin from "@/mixins/analytics-mixin.js";
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index d6e608d4b..ce18efb5c 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -27,8 +27,7 @@ import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { applicationConfig } from "../constants/application-config";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import router from "@/router/index.js";
+import { routeData } from "@/router/constants/routes";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 
 export default {
@@ -44,7 +43,7 @@ export default {
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
             const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
             const hasSubmittedOrderAtConfirmationPage =
-                hasSubmittedOrder && currentPageName?.toLowerCase() == fmgPageValues.CONFIRMATION;
+                hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name;
 
             const refSequenceNum = hasSubmittedOrderAtConfirmationPage
                 ? submittedOrder.referralSequenceNumber
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index e39908a8f..3dfca7dbf 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -2,9 +2,8 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
@@ -235,9 +234,6 @@ export default {
         vehicleCategories() {
             return vehicleCategories;
         },
-        routerParams() {
-            return routerParams;
-        },
         queryStrings() {
             return queryStrings;
         },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index ab39462ce..c8d6a554f 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,6 +1,6 @@
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { storeActions } from "@/constants/store-actions";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -53,11 +53,11 @@ export default {
         },
         comparePageIndices(currentPage, fmgPage) {
             const orderedVehicleQuestionPages = [
-                fmgPageValues.PART_QUESTIONS,
-                fmgPageValues.VEHICLE_PARTS,
-                fmgPageValues.MOLDING_QUESTIONS,
-                fmgPageValues.CAPABILITY_QUESTIONS,
-                fmgPageValues.QUOTE,
+                routeData.PART_QUESTIONS.name,
+                routeData.VEHICLE_PARTS.name,
+                routeData.MOLDING_QUESTIONS.name,
+                routeData.CAPABILITY_QUESTIONS.name,
+                routeData.QUOTE.name,
             ];
 
             return (
@@ -369,7 +369,7 @@ export default {
 
             if (
                 hasPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.PART_QUESTIONS.name)
             ) {
                 self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
@@ -378,7 +378,7 @@ export default {
                 );
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.VEHICLE_PARTS)
+                this.currentPageComesBeforePage(currentPage, routeData.VEHICLE_PARTS.name)
             ) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData
@@ -389,7 +389,7 @@ export default {
                 );
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.MOLDING_QUESTIONS.name)
             ) {
                 // if any childpart questions
                 // go to molding-questions page and pass the partsData
@@ -400,7 +400,7 @@ export default {
                 );
             } else if (
                 hasCapabilityQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
             ) {
                 // if has capability questions
                 // go to capability-questions page and pass the partsData
@@ -479,14 +479,14 @@ export default {
             const self = vm ?? this;
             const currentPage = self.pageName;
             const pageDataCapabilityQuestions = self.$store.getters.pageData(
-                fmgPageValues.CAPABILITY_QUESTIONS
+                routeData.CAPABILITY_QUESTIONS.name
             );
             const pageDataMoldingQuestions = self.$store.getters.pageData(
-                fmgPageValues.MOLDING_QUESTIONS
+                routeData.MOLDING_QUESTIONS.name
             );
-            const pageDataVehicleParts = self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            const pageDataVehicleParts = self.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
             const pageDataPartQuestions = self.$store.getters.pageData(
-                fmgPageValues.PART_QUESTIONS
+                routeData.PART_QUESTIONS.name
             );
 
             const allPartsOrQuestions = [
@@ -510,23 +510,23 @@ export default {
 
             if (
                 hasCapabilityQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS;
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.MOLDING_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS;
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS)
+                this.currentPageComesAfterPage(currentPage, routeData.VEHICLE_PARTS.name)
             ) {
                 backNavigationScenario =
                     navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE;
             } else if (
                 hasPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.PART_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
deleted file mode 100644
index 37bd5aa0d..000000000
--- a/src/router/a-rewrite/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { routes } from "@/router/a-rewrite/methods/routes";
-import { afterEach } from "@/router/a-rewrite/methods/after-each";
-import { beforeEach } from "@/router/a-rewrite/methods/before-each";
-import { bailout } from "@/router/a-rewrite/methods/error";
-import {
-    navigateWithoutSaving,
-    navigateWithSaving,
-    navigateWithPageData,
-    navigateAndForceTopLevelNavigation,
-} from "@/router/a-rewrite/methods/navigate";
-import { navigateToExternalUrl } from "@/router/a-rewrite/methods/navigate-external";
-import { createWebHistory, createRouter } from "vue-router";
-import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
-
-const router = createRouter({
-    history: createWebHistory(ROUTE_PREFIX_FULL),
-    routes,
-    // Scroll to top on navigation.
-    scrollBehavior(to, from, savedPosition) {
-        return { top: 0 };
-    },
-});
-
-// Set guards
-router.afterEach(async (to, from) => afterEach(to, from));
-router.beforeEach(async (to, from) => beforeEach(to, from));
-
-// Bind methods for external use
-router.navigateWithSaving = navigateWithSaving;
-router.navigateWithoutSaving = navigateWithoutSaving;
-router.navigateWithPageData = navigateWithPageData;
-router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
-
-router.bailout = bailout;
-
-router.navigateToExternalUrl = navigateToExternalUrl;
-
-export default router;
diff --git a/src/router/a-rewrite/constants/auto-route-table.js b/src/router/constants/auto-route-table.js
similarity index 100%
rename from src/router/a-rewrite/constants/auto-route-table.js
rename to src/router/constants/auto-route-table.js
diff --git a/src/router/a-rewrite/constants/externalUrl-values.js b/src/router/constants/externalUrl-values.js
similarity index 100%
rename from src/router/a-rewrite/constants/externalUrl-values.js
rename to src/router/constants/externalUrl-values.js
diff --git a/src/router/a-rewrite/constants/navigation-scenarios.js b/src/router/constants/navigation-scenarios.js
similarity index 100%
rename from src/router/a-rewrite/constants/navigation-scenarios.js
rename to src/router/constants/navigation-scenarios.js
diff --git a/src/router/a-rewrite/constants/route-prefix.js b/src/router/constants/route-prefix.js
similarity index 100%
rename from src/router/a-rewrite/constants/route-prefix.js
rename to src/router/constants/route-prefix.js
diff --git a/src/router/a-rewrite/constants/routes.js b/src/router/constants/routes.js
similarity index 100%
rename from src/router/a-rewrite/constants/routes.js
rename to src/router/constants/routes.js
diff --git a/src/router/a-rewrite/constants/routing-table.js b/src/router/constants/routing-table.js
similarity index 99%
rename from src/router/a-rewrite/constants/routing-table.js
rename to src/router/constants/routing-table.js
index 10ee7ae90..4b7286741 100644
--- a/src/router/a-rewrite/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -1,7 +1,7 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import { routeData } from "@/router/constants/routes";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import store from "@/store";
-import { paymentMethods } from "../../../constants/payment-method-constants";
+import { paymentMethods } from "@/constants/payment-method-constants";
 
 // Get as function to live-evaluate filters
 const routingTable = function () {
diff --git a/src/router/dynamic-routing/component-loader.js b/src/router/dynamic-routing/component-loader.js
deleted file mode 100644
index 5e25fb2ce..000000000
--- a/src/router/dynamic-routing/component-loader.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function lazyLoadComponent(componentName) {
-    return () => import(`@/layouts/${componentName}/${componentName}.vue`); // /src/layouts/folder/component.vue
-}
diff --git a/src/router/index.js b/src/router/index.js
index eddc14e16..cd842c5cb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,936 +1,41 @@
-// Supporting files
+import { routes } from "@/router/methods/routes";
+import { afterEach } from "@/router/methods/after-each";
+import { beforeEach } from "@/router/methods/before-each";
+import { bailout } from "@/router/methods/error";
+import {
+    navigateWithoutSaving,
+    navigateWithSaving,
+    navigateWithPageData,
+    navigateAndForceTopLevelNavigation,
+} from "@/router/methods/navigate";
+import { navigateToExternalUrl } from "@/router/methods/navigate-external";
+import { sendToReturnUser } from "@/router/methods/send-to-return-user";
 import { createWebHistory, createRouter } from "vue-router";
-import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "../constants/store-mutations";
-import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
-import { routingTable } from "@/router/router-constants/routing-table.js";
-import { globalEvents, globalEventTypes } from "@/constants/events";
-import { queryStrings } from "@/constants/query-strings";
-import { getQuerystringParameter, buildQuerystringObject } from "@/helpers/querystring-helper";
-import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
-import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
-import { fmgPageValues, funnelStartPageName } from "@/router/router-constants/fmgPage-values";
-import { externalParameterStatus } from "@/constants/external-parameters";
-
-// Heritage integration
-import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import {
-    updateOrCreateFunnelCookie,
-    getFunnelCookie,
-    updateSessionIdCookie,
-    deleteFunnelCookie,
-    getAffiliateCookies,
-    setupAdvertiserTracking,
-} from "@/helpers/heritage-integration/cookie-helper";
-import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
-import {
-    getPageToRouteExistingOrderTo,
-    navigateToHeritageFunnel,
-    getImplicitNavigation,
-} from "@/helpers/heritage-integration/navigation-helper";
-
-import baseMixin from "@/mixins/base-mixin";
-import eventBus from "@/helpers/event-bus/event-bus";
-import store from "@/store";
-import analyticsMixin from "@/mixins/analytics-mixin";
-import { experimentTriggers } from "../constants/experiments";
-import { applicationConfig } from "../constants/application-config";
-import { shouldStripPromoQueryString } from "@/helpers/promotions-helper";
-import bailout from "@/layouts/bailout/bailout";
-import { nextTick } from "vue";
-import { getBoolFromString } from "@/helpers/boolean-helper";
-
-const routes = [
-    {
-        path: "/bailout",
-        name: "bailout",
-        component: bailout,
-    },
-    {
-        path: "/",
-        name: "root",
-        async beforeEnter(to, from, next) {
-            // If we have no query string, or we don't have the FmgPage query string.
-            try {
-                log("------------- router index.js beforeEnter start -----------------");
-                log(" --to: ", to);
-                log(" --cookie: ", getFunnelCookie());
-                log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
-
-                await analyticsMixin.methods.validateSession();
-                var fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE);
-                var offerQuote = getQuerystringParameter(queryStrings.OFFER_QUOTE);
-                log(" --offerQuote: ", offerQuote);
-                // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
-                if (to.query) {
-                    delete to.query[queryStrings.FROM_HERITAGE];
-                }
-                //remove offerquote querystring if it exists
-                if (offerQuote) {
-                    delete to.query[queryStrings.OFFER_QUOTE];
-                }
-
-                if (getFunnelCookie()?.SuppressConceptFunnel) {
-                    log(" --go to heritage suppressConceptFunnel: ");
-                    await navigateToHeritageFunnel({ shouldSaveSession: false });
-                    return next(false);
-                }
-
-                // If the saved session has timed out, clear the session, execute 404 logic.
-                if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
-                    log(" --save session timeout go to start");
-
-                    const errorPayload = {
-                        cause: "expired session",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-                    deleteFunnelCookie();
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                const fromReturnUser = from?.name === fmgPageValues.RETURN_USER;
-                const fromContentSite = getQuerystringParameter(queryStrings.START_TYPE) === "fmg";
-                const toReturnUserPage = to.query?.fmgPage === fmgPageValues.RETURN_USER;
-                log(" --fromReturnUser ", fromReturnUser);
-                log(" --to.query.fmgPage ", to.query?.fmgPage);
-
-                // Intercept all navigation if a submitted order exists in storage
-                if (
-                    window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !==
-                    null
-                ) {
-                    if (to.query.fmgPage !== funnelStartPageName) {
-                        to.query.fmgPage = fmgPageValues.CONFIRMATION;
-                        log(
-                            ` --has ${sessionStorageKeyConstants.SUBMITTED_STATE} go to confirmation`
-                        );
-                    }
-                }
-                // On entering the funnel "fresh", read cookie information, decide what to do next.
-                else if (from.redirectedFrom === undefined || fromReturnUser) {
-                    // if entering the funnel from the content site, check and see if there is already a vehicle year in vuex.
-                    // if so, send them to return-user page.
-                    if (
-                        fromContentSite &&
-                        !toReturnUserPage &&
-                        store.getters.order.vehicle?.year > 0
-                    ) {
-                        log(" --from content site navigate to return user");
-                        var qso = {
-                            fmgPage: fmgPageValues.RETURN_USER,
-                        };
-
-                        const newQueryString = buildQuerystringObject(qso, true);
-                        log(" -- returnUser add querystring: " + JSON.stringify(newQueryString));
-
-                        router.push({
-                            path: "/",
-                            query: Object.assign({}, newQueryString),
-                        });
-                        return;
-                    }
-
-                    // clear the saveSessionPromise - if it exists in the vuex store but a new instance was created
-                    //   the saveSessionPromise will no longer point to a valid promise
-                    log(" --clear promise");
-                    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-
-                    if (!to.query.fmgPage?.startsWith("payment")) {
-                        //payment pages used to return from safelitehop so exclude here
-                        // Remove the parameter after quote release
-
-                        // for testing end to end locally, see if there is a referralNumber on the querystring
-                        // that could have changed in heritage and then stick it in the store and then update the cookie
-                        // so load-session runs properly. this can be removed when heritage goes away
-                        const referralNumber = getQuerystringParameter(
-                            queryStrings.REFERRAL_NUMBER
-                        );
-                        const parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
-                        const correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
-                        if (referralNumber) {
-                            store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
-                            store.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccount);
-                            store.commit(
-                                storeMutations.UPDATE_REFERRAL_CORRELATION_ID,
-                                correlationId
-                            );
-                            log(" --update cookie");
-                            updateOrCreateFunnelCookie();
-                        }
-
-                        //Affiliate Cookies
-                        const affiliateCookies = getAffiliateCookies();
-                        if (affiliateCookies != null && affiliateCookies.length > 0) {
-                            store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
-                        }
-                        setupAdvertiserTracking();
-                        log(" --load session start");
-                        const loadSessionResponse = await loadSessionIfPresent(
-                            to.query.isInsurance != null
-                                ? to.query.isInsurance == "true"
-                                    ? true
-                                    : false
-                                : null,
-                            to.query.fmgPage
-                        );
-                        log(" --load session end");
-
-                        //Update external parameter state but not when returning from heritage
-                        if (!to.query.fmgPage?.startsWith("service-location") && !fromReturnUser) {
-                            updateExternalParameterState();
-                        }
-
-                        //Update CASH tab when return from heritage and have offerQuote param
-                        if (offerQuote === "true" && fromHeritage === "true") {
-                            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
-                        }
-
-                        // clear part related state because heritage selected a new vehicle
-                        if (
-                            to.query.fmgPage === fmgPageValues.VEHICLE &&
-                            getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration) &&
-                            !fromReturnUser
-                        ) {
-                            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
-                        }
-
-                        // if coming from the return user page, clear the destination page so implicit navigation runs
-                        log(" --to.query ", JSON.stringify(to.query));
-                        if (fromReturnUser && to.query) {
-                            log(" --clear to.query");
-                            delete to.query[queryStrings.FMG_PAGE];
-
-                            //to.query[queryStrings.FMG_PAGE] = "";
-                            log(" --to.query cleared ", JSON.stringify(to.query));
-                        }
-
-                        const pageToRedirectTo = await getPageToRouteExistingOrderTo(to);
-                        log(" --pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
-
-                        // This logic may determine that the user should be sent to heritage -- if so, do that here.
-                        if (pageToRedirectTo === fmgPageValues.HERITAGE) {
-                            // prettier-ignore
-                            log(" --go to heritage pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
-                            await navigateToHeritageFunnel({ shouldSaveSession: false });
-                            return next(false);
-                        }
-
-                        // Assign our fmgPage so it will load normally like the other pages.
-                        to.query.fmgPage = pageToRedirectTo;
-                        log(" --assign to: ", JSON.stringify(pageToRedirectTo));
-                    }
-                }
-
-                // Reroute around pages that should not be available.
-
-                // Exception 1: Integrated Users should not see vehicle or quote pages.
-                if (
-                    store.getters.payment?.insuranceCoverage?.isVerified ||
-                    store.getters.order?.referralNumber?.length === 6
-                ) {
-                    if (to.query.fmgPage === fmgPageValues.VEHICLE) {
-                        to.query.fmgPage = fmgPageValues.VEHICLE_DAMAGE;
-                    } else if (
-                        to.query.fmgPage === fmgPageValues.QUOTE ||
-                        to.query.fmgPage === fmgPageValues.INSURANCE_COMPANY
-                    ) {
-                        log(" --block quote page for integrated clients - go to heritage");
-                        // Push to heritage if going to quote & integrated.
-                        await navigateToHeritageFunnel({ shouldSaveSession: false });
-                        return next(false);
-                    }
-                }
-
-                await runExperiments(to.query.fmgPage);
-
-                //Affiliate Cookies
-                const affiliateCookies = getAffiliateCookies();
-                if (affiliateCookies != null && affiliateCookies.length > 0) {
-                    store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
-                }
-                setupAdvertiserTracking();
-                // Process funnel cookie.
-                updateOrCreateFunnelCookie();
-
-                // If we already have our route, go to it.
-                if (router.hasRoute(to.query.fmgPage)) {
-                    // Since our route is already in scope, we can grab the component from it and call the arePagePrerequisitesValid function.
-                    let component = router
-                        .getRoutes()
-                        .filter((x) => x.name === to.query.fmgPage)[0].components;
-
-                    // If the component hasn't been loaded fully, load it before we check prerequisites.
-                    if (component.default.methods === undefined) {
-                        component = await component.default();
-                    }
-
-                    if (!arePagePrerequisitesValid(component)) {
-                        console.log("Page prereq error: " + component.default.name);
-
-                        if (to.query.fmgPage === fmgPageValues.PAYMENT) {
-                            await store.getters.applicationUser.saveSessionPromise;
-                            window.location = applicationConfig.PIA_CANCEL_URL;
-                            return;
-                        }
-
-                        const errorPayload = {
-                            cause: "invalid page prerequisites for page",
-                            currentPage: from?.query?.fmgPage,
-                            nextPage: to?.query?.fmgPage,
-                        };
-
-                        GoToFunnelStartOn404(next, errorPayload);
-                        return;
-                    }
-
-                    log(" --has route:", to.query.fmgPage);
-                    return next({ name: to.query.fmgPage, query: to.query, params: to.params });
-                }
-
-                if (!isExistingFmgPageName(to.query.fmgPage)) {
-                    const errorPayload = {
-                        cause: "invalid page name",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms.
-                const routeData = GetRouteInfoFromPageName(to.query.fmgPage);
-                log("--routeData:", routeData);
-
-                // Add our dynamic route.
-                router.addRoute({
-                    path: routeData[0].path, // Always the same path, because we control it with query strings.
-                    name: routeData[0].name,
-                    component: routeData[0].component,
-                });
-
-                // Call the next components arePagePrerequisitesValid method before load.
-                // If it returns false, use the 404 logic.
-                const nextComponent = await router
-                    .getRoutes()
-                    .filter((x) => x.name === routeData[0].name)[0]
-                    .components.default();
-
-                if (!arePagePrerequisitesValid(nextComponent)) {
-                    // prettier-ignore
-                    console.log("Page Prereqs not valid for next component: " + nextComponent.default.name);
-
-                    const errorPayload = {
-                        cause: "invalid page prerequisites for page",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                log("------------- router index.js beforeEnter end -----------------");
-
-                // Assign current query string parameters, as well as our fmgPage one.
-                next({
-                    name: routeData[0].name,
-                    query: Object.assign(to.query, { fmgPage: routeData[0].name }),
-                    params: to.params,
-                });
-            } catch (error) {
-                global.$logger.logError(`Routing ${error.stack}`);
-
-                if (to.query?.fmgPage === funnelStartPageName) {
-                    deleteFunnelCookie();
-                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-                }
-
-                console.log(new Date() + " Exception in beforeEnter:" + JSON.stringify(error));
-
-                // If we don't have a route, go to our 404 page.
-                const errorPayload = {
-                    cause: "uncaught error in beforeEnter",
-                    currentPage: from?.query?.fmgPage,
-                    nextPage: to?.query?.fmgPage,
-                    fullError: error,
-                    errorStack: error?.stack,
-                };
-
-                GoToFunnelStartOn404(next, errorPayload);
-                return;
-            }
-        },
-    },
-];
+import { ROUTE_PREFIX_FULL } from "@/router/constants/route-prefix";
 
 const router = createRouter({
-    history: createWebHistory("/fmg/"),
+    history: createWebHistory(ROUTE_PREFIX_FULL),
     routes,
-    //Cause "page" to begin at the top when route chanages.
+    // Scroll to top on navigation.
     scrollBehavior(to, from, savedPosition) {
-        // always scroll to top
         return { top: 0 };
     },
 });
 
-//---------------------------------------------------------- Router Functions ----------------------------------------------------------
+// Set guards
+router.afterEach(async (to, from) => afterEach(to, from));
+router.beforeEach(async (to, from) => beforeEach(to, from));
 
-router.beforeEach(async (to, from, next) => {
-    log("------------- router index.js beforeEach start -----------------");
-    // set lastNavigationPage here to capture state before API calls for analytics.
-    // use current page url query string name when to.name is "root" (due to unresolved navigation in beforeEach)
-    router.lastNavigationPage = to.name == "root" ? analyticsMixin.methods.getPageName() : to.name;
+// Bind methods for external use
+router.navigateWithSaving = navigateWithSaving;
+router.navigateWithoutSaving = navigateWithoutSaving;
+router.navigateWithPageData = navigateWithPageData;
+router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
 
-    const fromQueryPage = from.query?.fmgPage;
-    if (fromQueryPage === undefined) {
-        showFmgLoadingModal(true);
-    }
+router.bailout = bailout;
 
-    const toQueryPage = to.query?.fmgPage;
-    const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
-    const isInIframe = window !== window.top;
+router.navigateToExternalUrl = navigateToExternalUrl;
 
-    if (store.getters.externalParameterState?.isExternalParameter) {
-        // Check if alert event is on the bus
-        const alertEvent = eventBus.readEventFromBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.PAGE_NOT_FOUND
-        );
-        //Uknown alerts most likely were added by a failed api call in global-methods
-        const unknownAlertEvent = eventBus.readEventFromBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.UNKNOWN_ERROR
-        );
-        // If alert event is on the bus, then display the alert
-        if (alertEvent !== undefined || unknownAlertEvent !== undefined) {
-            store.commit(
-                storeMutations.UPDATE_IS_EXTERNAL_PARAMETER,
-                externalParameterStatus.INACTIVE
-            );
-        }
-    }
-    // fromPaymentToConfirmation workaround for navigating from an iframe but
-    // isInIframe evaluates to false for some reason when navigating from payment to confirmation
-    const fromPaymentToConfirmation =
-        fromQueryPage === fmgPageValues.PAYMENT && toQueryPage === fmgPageValues.CONFIRMATION;
-
-    if ((isInIframe && notToPIAReturn) || fromPaymentToConfirmation) {
-        const newUrl = `${window.top.location.origin}${to.href}`;
-        window.top.location.href = newUrl;
-        next(false);
-
-        // Refresh page if navigating to self to prevent locking.
-        // For now only carved out for vehicle; all modals are opened through anchor tags at the moment,
-        // which also self navigate, but relied on the page remaining the same on self-navigation.
-    } else if (toQueryPage === fromQueryPage && toQueryPage === getRedirectedStartPage()) {
-        router.go(0);
-        next(false);
-    } else {
-        next();
-    }
-    log("------------- router index.js beforeEach end -----------------");
-});
-
-router.afterEach(async (to, from) => {
-    // Update lastPageVisited in the store
-    store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
-
-    // If saving on navigation is requested, check for saved SessionId or EmailAddress to determine if saving is appropriate
-    if (getBoolFromString(window.history.state.isSavingNavigation)) {
-        if (
-            store.getters.applicationUser.savedSessionId ||
-            store.getters.order.customer?.emailAddress
-        ) {
-            await saveSession({ pageNameToLog: to.query.fmgPage });
-        }
-    }
-
-    // Push page view to GA
-    analyticsMixin.methods.pushPageViewToGA();
-
-    // Push experiments to Data Layer
-    analyticsMixin.methods.pushExperimentsToDataLayer();
-
-    // Push current order status to Data Layer
-    analyticsMixin.methods.pushOrderToDataLayer();
-
-    if (to.query.fmgPage == fmgPageValues.CONFIRMATION) {
-        //Push Ecommerce Cart to Data Layer
-        analyticsMixin.methods.pushECommerceCartToDataLayer();
-
-        //Push Product Array to Data Layer
-        analyticsMixin.methods.pushProductArrayToDataLayer();
-
-        //Push Commission Junction Gtm Data To Data Layer
-        analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
-    }
-});
-
-router.navigateWithoutSaving = (
-    scenario,
-    currentRoute,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) => {
-    navigate(scenario, currentRoute, false, optionalQuery, optionalParams, optionalPageData);
-};
-
-router.navigateWithSaving = (
-    scenario,
-    currentRoute,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) => {
-    navigate(scenario, currentRoute, true, optionalQuery, optionalParams, optionalPageData);
-};
-
-router.navigateToExternalUrl = (url, optionalQuery = {}) => {
-    log("------------- router navigateToExternalUrl -----------------");
-    log("url:", url);
-    navigateToUrl(url, optionalQuery);
-};
-
-router.navigateError = (errorPayload = null) => {
-    DisplayPageError(errorPayload);
-};
-
-//Use this navigation when you need to call next() explicitly. beforeRouteEnter is a good example.
-router.overrideNavigation = (
-    scenario,
-    currentRoute,
-    next,
-    isSavingNavigation,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData
-) => {
-    log("------------- router overrideNavigation -----------------");
-    log("scenario:", scenario);
-    log("currentRoute:", currentRoute);
-    log("isSavingNavigation:", isSavingNavigation);
-    log("optionalQuery:", optionalQuery);
-    log("optionalParams:", optionalParams);
-    log("optionalPageData:", optionalPageData);
-    navigate(
-        scenario,
-        currentRoute,
-        isSavingNavigation,
-        optionalQuery,
-        optionalParams,
-        optionalPageData
-    );
-    next();
-};
-
-router.getNextPage = () => nextPageName;
-
-// PRIVATE VARIABLES
-
-var nextPageName;
-
-// PRIVATE FUNCTIONS
-
-// Navigate to the next route, depending on the scenario.
-async function navigate(
-    scenario,
-    currentRoute,
-    isSavingNavigation,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) {
-    if (!scenario) {
-        console.error("No scenario provided. Please review the routing table.");
-        return;
-    }
-
-    // Match our maps up and navigate if we have a destination.
-    const matchingScenarioMap = getNavigationMap(scenario, currentRoute);
-    const destinationFmgPageValue = matchingScenarioMap.destinationFmgPageValue;
-
-    if (destinationFmgPageValue !== undefined) {
-        // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one.
-
-        nextPageName = destinationFmgPageValue;
-
-        // Update page data to the store for next page if provided. Otherwise, keep existing page data or set to empty object
-        const existingPageDataForPage = store.getters.pageData(destinationFmgPageValue);
-        baseMixin.methods.savePageDataToStore(
-            destinationFmgPageValue,
-            Object.keys(optionalPageData).length > 0
-                ? optionalPageData
-                : (existingPageDataForPage ?? {})
-        );
-
-        optionalParams.isSavingNavigation = isSavingNavigation;
-
-        // add querystring params to the route. if they are already in the store then no need to add them
-        var queryStringsObject = {
-            fmgPage: destinationFmgPageValue,
-        };
-
-        const hasZip = getQuerystringParameter(queryStrings.ZIP_CODE);
-        const zip = getQuerystringParameter(queryStrings.ZIP_CODE);
-        const promo = getQuerystringParameter(queryStrings.PROMO);
-        const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
-        const logQs = getQuerystringParameter(queryStrings.LOG);
-        baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
-
-        log("------------- router index.js navigate start -----------------");
-        log(" --scenario: ", scenario);
-        log(" --isSavingNavigation: ", isSavingNavigation);
-        log(" --optionalQuery: ", optionalQuery);
-        log(" --optionalParams: ", optionalParams);
-        log(" --optionalPageData: ", optionalPageData);
-        log(" --nextPageName: ", nextPageName);
-
-        if (
-            hasZip &&
-            (store.getters.order.serviceLocation.zipCode === undefined ||
-                store.getters.order.serviceLocation.zipCode == null) &&
-            (store.getters.order.vehicle.registration.zipCode === undefined ||
-                store.getters.order.vehicle.registration.zipCode == null)
-        ) {
-            queryStringsObject[queryStrings.ZIP_CODE] = zip;
-        }
-
-        if (promo && !shouldStripPromoQueryString(currentRoute.query.fmgPage)) {
-            queryStringsObject[queryStrings.PROMO] = promo;
-        }
-
-        if (pageError) {
-            queryStringsObject[queryStrings.PAGE_ERROR] = pageError;
-        }
-
-        if (logQs) {
-            queryStringsObject[queryStrings.LOG] = logQs;
-        }
-
-        log(" querystrings: ", queryStringsObject);
-        log("------------- router index.js navigate end -----------------");
-
-        router.push({
-            name: "root",
-            query: Object.assign(optionalQuery, queryStringsObject),
-            state: optionalParams,
-        });
-    } else if (matchingScenarioMap.destinationUrl !== undefined) {
-        navigateToUrl(matchingScenarioMap.destinationUrl, optionalQuery);
-    }
-}
-
-// Get navigation map depending on the scenario and the current 'page' you're on.
-function getNavigationMap(scenario, currentRoute) {
-    const fmgPageValue = currentRoute.query.fmgPage;
-    log("------------- router index.js getNavigationMap start -----------------");
-    log("fmgPage: " + fmgPageValue + " scenario: " + scenario, "");
-    log("------------- router index.js getNavigationMap end -----------------");
-    const matchedQueryValue = routingTable(store)
-        .filter(
-            (item) =>
-                item.fmgPageValue === fmgPageValue &&
-                item.maps.filter((map) => map.scenario === scenario).length > 0
-        )
-        .map((m) => m.maps.filter((map) => map.scenario === scenario))[0]
-        .filter((x) => x.filter === true || x.filter === undefined);
-
-    return matchedQueryValue[0];
-}
-
-function log(message, data) {
-    const log = getQuerystringParameter(queryStrings.LOG);
-    baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, log, false);
-
-    data = data ?? "";
-    const outData = typeof data === "object" ? JSON.stringify(data) : data;
-
-    if (log === "true" || store.getters.applicationUser.loggingOption) {
-        console.log(new Date() + message + outData);
-    }
-}
-
-//---------------------------------------------------------- Private Functions ----------------------------------------------------------
-
-// Navigate to an external url.
-function navigateToUrl(url, optionalQuery = {}) {
-    // possibly show some loading screen in the future here.
-    var externalUrl = new URL(url);
-
-    for (const queryKey in optionalQuery) {
-        externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
-    }
-
-    window.location.assign(externalUrl);
-}
-
-// Get route information by page name.
-// This will no longer reach out to the Cms. There is a 1:1 relationship between page names and route names and layouts.
-function GetRouteInfoFromPageName(pageName) {
-    // check if pagename is a valid route/component
-    if (!isExistingFmgPageName(pageName)) {
-        return [];
-    }
-
-    const routeData = [
-        {
-            path: "/",
-            name: pageName,
-            component: lazyLoadComponent(pageName),
-        },
-    ];
-
-    return routeData;
-}
-
-// Go to our start page on a 404.
-function GoToFunnelStartOn404(next, errorPayload = null) {
-    if (errorPayload !== null) {
-        errorPayload.type = "GoToFunnelStartOn404";
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-
-        console.log(
-            "%cGoToFunnelStartOn404()... errorPayload",
-            "color: white; background-color: blue; padding: 5px;",
-            errorPayload
-        );
-    }
-
-    // Put item on the bus
-    eventBus.addEventToBus(
-        globalEvents.Categories.GLOBAL_ALERT,
-        globalEvents.SubCategories.PAGE_NOT_FOUND,
-        {
-            isDismissible: true,
-            messageCopy: "You can get a quote by starting on this page.",
-            messageHeadline: "We're sorry, something went wrong.",
-            type: globalEventTypes.Danger,
-        }
-    );
-
-    next({
-        path: "/",
-        query: { fmgPage: funnelStartPageName },
-    });
-}
-
-async function DisplayPageError(errorPayload = null) {
-    console.log("%c running DisplayPageError()... ", "font-size: 20px; color: purple;");
-
-    if (errorPayload !== null) {
-        errorPayload.type = "DisplayPageError";
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-    } else {
-        // very cautiously to avoid additional errors:
-        var currentPage = "";
-        try {
-            currentPage = getQuerystringParameter(queryStrings.FMG_PAGE);
-        } catch (e) {
-            // pass
-        }
-        errorPayload = {
-            type: "DisplayPageError",
-            cause: "Unknown page error",
-            currentPage: currentPage,
-        };
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-    }
-
-    // Put item on the bus
-    eventBus.addEventToBus(
-        globalEvents.Categories.GLOBAL_ALERT,
-        globalEvents.SubCategories.UNKNOWN_ERROR,
-        {
-            isDismissible: true,
-            messageCopy: "",
-            messageHeadline: "We're sorry, something went wrong.",
-            type: globalEventTypes.Danger,
-        }
-    );
-    if (
-        store.getters.externalParameterState?.isExternalParameter == externalParameterStatus.ACTIVE
-    ) {
-        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.INACTIVE);
-    }
-    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-    const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
-
-    // we use the pageError querystring as a counter to how many times a user has experienced an error and been routed here.
-    // once they receive more than 1 pageerrors, we'll reset their state to hopefully correct any issues they may be having.
-    var navPage = fmgPageValues.VEHICLE;
-    if (store.getters.payment?.insuranceCoverage?.isVerified) {
-        navPage = fmgPageValues.VEHICLE_DAMAGE;
-    }
-
-    if (pageError) {
-        var errorCount = Number(pageError);
-        if (errorCount > 1) {
-            deleteFunnelCookie();
-            await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-
-            router.push({
-                path: "/",
-                query: { fmgPage: navPage },
-            });
-        } else {
-            errorCount++;
-            router.push({
-                path: "/",
-                query: { fmgPage: navPage, pageError: errorCount },
-            });
-        }
-    } else {
-        router.push({
-            path: "/",
-            query: { fmgPage: navPage, pageError: "1" },
-        });
-    }
-}
-
-function isExistingFmgPageName(pageName) {
-    const names = Object.values(fmgPageValues);
-
-    return names.some((name) => name === pageName);
-}
-
-// Checks arePagePrerequisitesValid on the component passed in.
-function arePagePrerequisitesValid(component) {
-    return component.default.methods.arePagePrerequisitesValid();
-}
-
-// Run SiteEntry and PageEntry triggers for experiments
-async function runExperiments(nextPage) {
-    if (!store.getters.applicationUser.triggeredSiteEntry) {
-        await baseMixin.methods.dispatchStoreActionWithLogging(
-            storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-            {
-                deviceId: getDeviceIdValue(),
-                triggerEvent: experimentTriggers.SITE_ENTRY,
-                triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
-            },
-            nextPage
-        );
-    }
-
-    await baseMixin.methods.dispatchStoreActionWithLogging(
-        storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-        {
-            deviceId: getDeviceIdValue(),
-            triggerEvent: experimentTriggers.PAGE_ENTRY,
-            triggerValue: nextPage,
-        },
-        nextPage
-    );
-}
-
-function getRedirectedStartPage() {
-    if (store.getters.payment?.insuranceCoverage?.isVerified) {
-        return fmgPageValues.VEHICLE_DAMAGE;
-    } else {
-        return funnelStartPageName;
-    }
-}
-
-function updateExternalParameterState() {
-    const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
-    const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
-    const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
-    const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
-    const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
-    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
-    const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
-    const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
-    const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
-    const externalParameterServicePackage = getQuerystringParameter(queryStrings.SERVICE_PACKAGE);
-    const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
-    const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
-    const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
-    if (
-        externalParameterYear &&
-        externalParameterMake &&
-        externalParameterModel &&
-        externalParameterStyle
-    ) {
-        resetStoreForExternalParameter();
-        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
-    }
-    if (
-        externalParameterDamage &&
-        (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR" ||
-            externalParameterNumberOfChips?.length > 0)
-    ) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_DAMAGE_TYPE, externalParameterDamage);
-        if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPLACE") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS, null);
-        } else if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPAIR") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, true);
-            store.commit(
-                storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS,
-                externalParameterNumberOfChips
-            );
-        }
-    }
-    if (externalParameterZipCode) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
-    }
-    if (externalParameterEmail) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
-            externalParameterEmail
-        );
-    }
-    if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE,
-            externalParameterServicePackage?.toLowerCase()
-        );
-    }
-    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
-            externalParameterVinSelection
-        );
-    }
-    if (externalParameterSource) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_SOURCE, externalParameterSource);
-    }
-    if (externalParameterPhoneNumber) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
-            externalParameterPhoneNumber
-        );
-    }
-}
-
-// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
-// are returning.  clear out prior related things that need to be selected again like parts and damage type.
-function resetStoreForExternalParameter() {
-    if (
-        store.getters.externalParameterState?.isExternalParameter ==
-        externalParameterStatus.INACTIVE
-    ) {
-        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
-        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
-            state: null,
-            zipCode: null,
-            zipCodeCtu: null,
-        });
-        store.dispatch(storeActions.SAVE_EMAIL, null);
-        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
-    }
-}
+router.sendToReturnUser = sendToReturnUser;
 
 export default router;
diff --git a/src/router/a-rewrite/methods/after-each.js b/src/router/methods/after-each.js
similarity index 100%
rename from src/router/a-rewrite/methods/after-each.js
rename to src/router/methods/after-each.js
diff --git a/src/router/a-rewrite/methods/before-each.js b/src/router/methods/before-each.js
similarity index 86%
rename from src/router/a-rewrite/methods/before-each.js
rename to src/router/methods/before-each.js
index 05264ed3c..dae53b583 100644
--- a/src/router/a-rewrite/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -7,12 +7,12 @@ import {
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
-import { runExperiments } from "@/router/a-rewrite/methods/helpers/run-experiments";
+import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { runExperiments } from "@/router/methods/helpers/run-experiments";
 
-import { bailout } from "@/router/a-rewrite/methods/error";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+import { bailout } from "@/router/methods/error";
+import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 
 export async function beforeEach(to, from) {
     try {
diff --git a/src/router/a-rewrite/methods/error.js b/src/router/methods/error.js
similarity index 78%
rename from src/router/a-rewrite/methods/error.js
rename to src/router/methods/error.js
index 3c50c1768..f9f20c19d 100644
--- a/src/router/a-rewrite/methods/error.js
+++ b/src/router/methods/error.js
@@ -1,6 +1,6 @@
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import router from "@/router/a-rewrite";
+import { routeData } from "@/router/constants/routes";
+import router from "@/router";
 
 export async function bailout(errorPayload, forceRestart = false) {
     analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
diff --git a/src/router/a-rewrite/methods/get-route.js b/src/router/methods/get-route.js
similarity index 71%
rename from src/router/a-rewrite/methods/get-route.js
rename to src/router/methods/get-route.js
index ead89eb5b..9c6e84c0c 100644
--- a/src/router/a-rewrite/methods/get-route.js
+++ b/src/router/methods/get-route.js
@@ -1,4 +1,4 @@
-import router from "@/router/a-rewrite";
+import router from "@/router";
 
 export function getRoute(pageName) {
     return router.getRoutes().find((r) => r.name === pageName);
diff --git a/src/router/a-rewrite/methods/helpers/build-manual-url.js b/src/router/methods/helpers/build-manual-url.js
similarity index 88%
rename from src/router/a-rewrite/methods/helpers/build-manual-url.js
rename to src/router/methods/helpers/build-manual-url.js
index 260b41257..a1638601b 100644
--- a/src/router/a-rewrite/methods/helpers/build-manual-url.js
+++ b/src/router/methods/helpers/build-manual-url.js
@@ -1,4 +1,4 @@
-import { ROUTE_PREFIX_TRIMMED } from "@/router/a-rewrite/constants/route-prefix";
+import { ROUTE_PREFIX_TRIMMED } from "@/router/constants/route-prefix";
 
 export function buildManualUrl(nextPage) {
     const queries = nextPage.params;
diff --git a/src/router/a-rewrite/methods/helpers/consume-referral-info.js b/src/router/methods/helpers/consume-referral-info.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/consume-referral-info.js
rename to src/router/methods/helpers/consume-referral-info.js
diff --git a/src/router/a-rewrite/methods/helpers/create-route.js b/src/router/methods/helpers/create-route.js
similarity index 87%
rename from src/router/a-rewrite/methods/helpers/create-route.js
rename to src/router/methods/helpers/create-route.js
index a1535f3c8..32410e3b3 100644
--- a/src/router/a-rewrite/methods/helpers/create-route.js
+++ b/src/router/methods/helpers/create-route.js
@@ -1,5 +1,5 @@
-import { lazyLoadComponent } from "@/router/a-rewrite/methods/helpers/lazy-load-component";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { lazyLoadComponent } from "@/router/methods/helpers/lazy-load-component";
+import { routeData } from "@/router/constants/routes";
 
 export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
     return {
diff --git a/src/router/a-rewrite/methods/helpers/get-destination.js b/src/router/methods/helpers/get-destination.js
similarity index 85%
rename from src/router/a-rewrite/methods/helpers/get-destination.js
rename to src/router/methods/helpers/get-destination.js
index cd04ddaad..e123afcb1 100644
--- a/src/router/a-rewrite/methods/helpers/get-destination.js
+++ b/src/router/methods/helpers/get-destination.js
@@ -1,4 +1,4 @@
-import { routingTable } from "@/router/a-rewrite/constants/routing-table";
+import { routingTable } from "@/router/constants/routing-table";
 
 export function getDestination(sourcePageName, navigationScenario) {
     const table = routingTable();
diff --git a/src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js b/src/router/methods/helpers/initialize-from-querystrings.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
rename to src/router/methods/helpers/initialize-from-querystrings.js
diff --git a/src/router/a-rewrite/methods/helpers/lazy-load-component.js b/src/router/methods/helpers/lazy-load-component.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/lazy-load-component.js
rename to src/router/methods/helpers/lazy-load-component.js
diff --git a/src/router/a-rewrite/methods/helpers/querystring-stash.js b/src/router/methods/helpers/querystring-stash.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/querystring-stash.js
rename to src/router/methods/helpers/querystring-stash.js
diff --git a/src/router/a-rewrite/methods/helpers/requires-verified-redirect.js b/src/router/methods/helpers/requires-verified-redirect.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
rename to src/router/methods/helpers/requires-verified-redirect.js
diff --git a/src/router/a-rewrite/methods/helpers/run-experiments.js b/src/router/methods/helpers/run-experiments.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/run-experiments.js
rename to src/router/methods/helpers/run-experiments.js
diff --git a/src/router/a-rewrite/methods/helpers/save-page-data.js b/src/router/methods/helpers/save-page-data.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/save-page-data.js
rename to src/router/methods/helpers/save-page-data.js
diff --git a/src/router/a-rewrite/methods/navigate-external.js b/src/router/methods/navigate-external.js
similarity index 100%
rename from src/router/a-rewrite/methods/navigate-external.js
rename to src/router/methods/navigate-external.js
diff --git a/src/router/a-rewrite/methods/navigate.js b/src/router/methods/navigate.js
similarity index 79%
rename from src/router/a-rewrite/methods/navigate.js
rename to src/router/methods/navigate.js
index ca8de4784..7df947560 100644
--- a/src/router/a-rewrite/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -1,18 +1,12 @@
 import { saveSession } from "@/helpers/heritage-integration/order-helper";
-import { buildManualUrl } from "@/router/a-rewrite/methods/helpers/build-manual-url";
-import { getDestination } from "@/router/a-rewrite/methods/helpers/get-destination";
-import { savePageData } from "@/router/a-rewrite/methods/helpers/save-page-data";
-import router from "@/router/a-rewrite";
+import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
+import { getDestination } from "@/router/methods/helpers/get-destination";
+import { savePageData } from "@/router/methods/helpers/save-page-data";
+import router from "@/router";
 
-import { bailout } from "@/router/a-rewrite/methods/error";
+import { bailout } from "@/router/methods/error";
 
 async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
-    console.log(`Navigate:\n
-        - scenario: ${scenario}\n
-        - currentPage: ${currentPageName}\n
-        - withSaving: ${withSaving}\n
-        - forceTopLevelNav: ${forceTopLevelNav}`);
-    
     // Check to see if calling page is same as current page.
     // If not, cancel navigation before it begins.
     const callingRoute = currentPageName;
diff --git a/src/router/a-rewrite/methods/page-prerequisites.js b/src/router/methods/page-prerequisites.js
similarity index 87%
rename from src/router/a-rewrite/methods/page-prerequisites.js
rename to src/router/methods/page-prerequisites.js
index 581ab0354..8a6538eff 100644
--- a/src/router/a-rewrite/methods/page-prerequisites.js
+++ b/src/router/methods/page-prerequisites.js
@@ -1,4 +1,4 @@
-import { getRoute } from "@/router/a-rewrite/methods/get-route";
+import { getRoute } from "@/router/methods/get-route";
 
 export async function checkPagePrerequisites(pageName) {
     const route = getRoute(pageName);
diff --git a/src/router/a-rewrite/methods/route-logic/auto-route.js b/src/router/methods/route-logic/auto-route.js
similarity index 65%
rename from src/router/a-rewrite/methods/route-logic/auto-route.js
rename to src/router/methods/route-logic/auto-route.js
index a6d55e4fa..228f80483 100644
--- a/src/router/a-rewrite/methods/route-logic/auto-route.js
+++ b/src/router/methods/route-logic/auto-route.js
@@ -1,6 +1,6 @@
-import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+import { autoRouteTable } from "@/router/constants/auto-route-table";
+import { FUNNEL_START_PAGE } from "@/router/constants/routes";
+import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 
 export async function autoRouteBeforeEnter(to, from) {
     for (let i = 0; i < autoRouteTable.length; i++) {
diff --git a/src/router/a-rewrite/methods/route-logic/error.js b/src/router/methods/route-logic/error.js
similarity index 92%
rename from src/router/a-rewrite/methods/route-logic/error.js
rename to src/router/methods/route-logic/error.js
index c4bdeb6d5..8707a65d9 100644
--- a/src/router/a-rewrite/methods/route-logic/error.js
+++ b/src/router/methods/route-logic/error.js
@@ -2,8 +2,8 @@ import { globalEvents, globalEventTypes } from "@/constants/events";
 import { storeActions } from "@/constants/store-actions";
 import eventBus from "@/helpers/event-bus/event-bus";
 import baseMixin from "@/mixins/base-mixin";
-import router from "@/router/a-rewrite";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import router from "@/router";
+import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
 import store from "@/store";
 
 export async function errorBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/heritage.js b/src/router/methods/route-logic/heritage.js
similarity index 100%
rename from src/router/a-rewrite/methods/route-logic/heritage.js
rename to src/router/methods/route-logic/heritage.js
diff --git a/src/router/a-rewrite/methods/route-logic/insurance-company.js b/src/router/methods/route-logic/insurance-company.js
similarity index 54%
rename from src/router/a-rewrite/methods/route-logic/insurance-company.js
rename to src/router/methods/route-logic/insurance-company.js
index 18d961854..d3c69b908 100644
--- a/src/router/a-rewrite/methods/route-logic/insurance-company.js
+++ b/src/router/methods/route-logic/insurance-company.js
@@ -1,5 +1,5 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 
 export async function insuranceCompanyBeforeEnter(to, from) {
     if (isVerifiedInsurance()) {
diff --git a/src/router/a-rewrite/methods/route-logic/landing.js b/src/router/methods/route-logic/landing.js
similarity index 69%
rename from src/router/a-rewrite/methods/route-logic/landing.js
rename to src/router/methods/route-logic/landing.js
index b71d7a9db..b50f321c1 100644
--- a/src/router/a-rewrite/methods/route-logic/landing.js
+++ b/src/router/methods/route-logic/landing.js
@@ -1,8 +1,8 @@
-import router from "@/router/a-rewrite";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { consumeReferralQuerystrings } from "@/router/a-rewrite/methods/helpers/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/a-rewrite/methods/helpers/initialize-from-querystrings";
-import { stashAllQueries } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import router from "@/router";
+import { routeData } from "@/router/constants/routes";
+import { consumeReferralQuerystrings } from "@/router/methods/helpers/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/methods/helpers/initialize-from-querystrings";
+import { stashAllQueries } from "@/router/methods/helpers/querystring-stash";
 import store from "@/store";
 
 export async function landingBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/load-session.js b/src/router/methods/route-logic/load-session.js
similarity index 82%
rename from src/router/a-rewrite/methods/route-logic/load-session.js
rename to src/router/methods/route-logic/load-session.js
index c70eb28d6..9265ed543 100644
--- a/src/router/a-rewrite/methods/route-logic/load-session.js
+++ b/src/router/methods/route-logic/load-session.js
@@ -1,5 +1,5 @@
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { routeData } from "@/router/constants/routes";
 
 export async function loadSessionBeforeEnter(to, from) {
     const loadSessionResponse = await loadSessionIfPresent(false, to.name);
diff --git a/src/router/a-rewrite/methods/route-logic/quote.js b/src/router/methods/route-logic/quote.js
similarity index 75%
rename from src/router/a-rewrite/methods/route-logic/quote.js
rename to src/router/methods/route-logic/quote.js
index 9771b9bbb..a74e95577 100644
--- a/src/router/a-rewrite/methods/route-logic/quote.js
+++ b/src/router/methods/route-logic/quote.js
@@ -1,7 +1,7 @@
 import { queryStrings } from "@/constants/query-strings";
 import { storeMutations } from "@/constants/store-mutations";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function quoteBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/restart.js b/src/router/methods/route-logic/restart.js
similarity index 84%
rename from src/router/a-rewrite/methods/route-logic/restart.js
rename to src/router/methods/route-logic/restart.js
index 4589999e0..015c997a0 100644
--- a/src/router/a-rewrite/methods/route-logic/restart.js
+++ b/src/router/methods/route-logic/restart.js
@@ -1,7 +1,7 @@
 import { storeActions } from "@/constants/store-actions";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import router from "@/router/a-rewrite";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import router from "@/router";
+import { FUNNEL_START_PAGE } from "@/router/constants/routes";
 import store from "@/store";
 
 export async function restartBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/vehicle.js b/src/router/methods/route-logic/vehicle.js
similarity index 81%
rename from src/router/a-rewrite/methods/route-logic/vehicle.js
rename to src/router/methods/route-logic/vehicle.js
index ed241d7de..e1da282d0 100644
--- a/src/router/a-rewrite/methods/route-logic/vehicle.js
+++ b/src/router/methods/route-logic/vehicle.js
@@ -1,8 +1,8 @@
 import { storeMutations } from "@/constants/store-mutations";
 import { getBoolFromString } from "@/helpers/boolean-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function vehicleBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/routes.js b/src/router/methods/routes.js
similarity index 60%
rename from src/router/a-rewrite/methods/routes.js
rename to src/router/methods/routes.js
index 5cbc8e94e..0911b78dd 100644
--- a/src/router/a-rewrite/methods/routes.js
+++ b/src/router/methods/routes.js
@@ -1,15 +1,15 @@
-import { createRoute, createVirtualRoute } from "@/router/a-rewrite/methods/helpers/create-route";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { createRoute, createVirtualRoute } from "@/router/methods/helpers/create-route";
+import { routeData } from "@/router/constants/routes";
 
-import { vehicleBeforeEnter } from "@/router/a-rewrite/methods/route-logic/vehicle";
-import { quoteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/quote";
-import { insuranceCompanyBeforeEnter } from "@/router/a-rewrite/methods/route-logic/insurance-company";
-import { landingBeforeEnter } from "@/router/a-rewrite/methods/route-logic/landing";
-import { heritageBeforeEnter } from "@/router/a-rewrite/methods/route-logic/heritage";
-import { loadSessionBeforeEnter } from "@/router/a-rewrite/methods/route-logic/load-session";
-import { autoRouteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/auto-route";
-import { errorBeforeEnter } from "@/router/a-rewrite/methods/route-logic/error";
-import { restartBeforeEnter } from "@/router/a-rewrite/methods/route-logic/restart";
+import { vehicleBeforeEnter } from "@/router/methods/route-logic/vehicle";
+import { quoteBeforeEnter } from "@/router/methods/route-logic/quote";
+import { insuranceCompanyBeforeEnter } from "@/router/methods/route-logic/insurance-company";
+import { landingBeforeEnter } from "@/router/methods/route-logic/landing";
+import { heritageBeforeEnter } from "@/router/methods/route-logic/heritage";
+import { loadSessionBeforeEnter } from "@/router/methods/route-logic/load-session";
+import { autoRouteBeforeEnter } from "@/router/methods/route-logic/auto-route";
+import { errorBeforeEnter } from "@/router/methods/route-logic/error";
+import { restartBeforeEnter } from "@/router/methods/route-logic/restart";
 
 export const routes = [
     // Non-virtual pages.
diff --git a/src/router/methods/send-to-return-user.js b/src/router/methods/send-to-return-user.js
new file mode 100644
index 000000000..f1f864cb1
--- /dev/null
+++ b/src/router/methods/send-to-return-user.js
@@ -0,0 +1,11 @@
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router";
+import { routeData } from "@/router/constants/routes";
+
+export function sendToReturnUser() {
+    analyticsMixin.methods.initSession();
+
+    router.push({
+        name: routeData.RETURN_USER.name,
+    });
+}
diff --git a/src/router/router-constants/externalUrl-values.js b/src/router/router-constants/externalUrl-values.js
deleted file mode 100644
index 5516095c4..000000000
--- a/src/router/router-constants/externalUrl-values.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const externalUrls = {
-    HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
-    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
-};
-
-export { externalUrls };
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
deleted file mode 100644
index 1cba0414b..000000000
--- a/src/router/router-constants/fmgPage-values.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const fmgPageValues = {
-    VEHICLE: "vehicle",
-    VEHICLE_DAMAGE: "vehicle-damage",
-    ADDRESS_LOOKUP: "address-lookup",
-    VIN_LOOKUP: "vin-lookup",
-    VEHICLE_PARTS: "vehicle-parts",
-    PART_QUESTIONS: "part-questions",
-    MOLDING_QUESTIONS: "molding-questions",
-    CAPABILITY_QUESTIONS: "capability-questions",
-    LICENSE_PLATE_LOOKUP: "license-plate-lookup",
-    ESTIMATE: "estimate",
-    SERVICE_ZIP: "service-zip",
-    ADDRESS_VEHICLES: "address-vehicles",
-    QUOTE: "quote",
-    INSURANCE_COMPANY: "insurance-company",
-    INSURANCE_DETAILS: "insurance-details",
-    SERVICE_LOCATION: "service-location",
-    HERITAGE: "heritage",
-    SCHEDULE: "schedule",
-    CUSTOMER_DETAILS: "customer-details",
-    PAYMENT_METHOD: "payment-method",
-    PAYMENT: "payment",
-    PAYMENT_PIA_RETURN: "payment-pia-return",
-    CONFIRMATION: "confirmation",
-    RETURN_USER: "return-user",
-    EMAIL_SMS_PAGES: "email-or-sms-related-pages",
-};
-
-const funnelStartPageName = fmgPageValues.VEHICLE;
-const returnUserPageName = fmgPageValues.RETURN_USER;
-
-export { fmgPageValues, funnelStartPageName, returnUserPageName };
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
deleted file mode 100644
index 56a40926a..000000000
--- a/src/router/router-constants/navigation-scenarios.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * We want to name these to describe the scenario rather than what page(s) they're used on.
- *
- * Naming convention: [PAST_TENSE_VERB]_[DESCRIPTOR_OF_STATE]
- * ex: Rather than "HAS_PART_QUESTIONS", we might name the
- *     scenario "CLICKED_FORWARD_WITH_PART_QUESTIONS"
- */
-
-const navigationScenarios = {
-    // General
-    CLICKED_BACK: "CLICKED_BACK",
-    CLICKED_FORWARD: "CLICKED_FORWARD",
-    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
-    CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
-
-    // Vin selection
-    CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
-    CLICKED_BACK_WITH_SKIP_VIN: "CLICKED_BACK_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
-    CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
-    CLICKED_FORWARD_WITH_SKIP_VIN: "CLICKED_FORWARD_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES: "CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES",
-    SELECTED_VIN_WITH_MISMATCHED_GLASS: "SELECTED_VIN_WITH_MISMATCHED_GLASS",
-    SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
-    SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
-    SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
-    SELECTED_NO_VIN: "SELECTED_NO_VIN",
-    CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
-    CLICKED_VIN_RETRY: "CLICKED_VIN_RETRY",
-
-    // Part selection
-    CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
-    CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_FORWARD_WITH_MOLDING_QUESTIONS: "CLICKED_FORWARD_WITH_MOLDING_QUESTIONS",
-    CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS: "CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS: "CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
-    CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
-    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
-
-    // Schedule
-    CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
-
-    // Payment
-    CLICKED_INSURANCE: "CLICKED_INSURANCE",
-    CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
-    PIA_ERROR: "PIA_ERROR",
-    PIA_CC_ERROR: "PIA_CC_ERROR",
-    PIA_SUCCESS: "PIA_SUCCESS",
-};
-
-export { navigationScenarios };
diff --git a/src/router/router-constants/router-params.js b/src/router/router-constants/router-params.js
deleted file mode 100644
index ae7b88283..000000000
--- a/src/router/router-constants/router-params.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const routerParams = {
-    DISPLAY_VEHICLE_CHANGE_ALERT: "displayVehicleChangeAlert",
-    DISPLAY_PIA_ALERT: "displayPiaAlert",
-};
-
-export { routerParams };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
deleted file mode 100644
index 8891e7cff..000000000
--- a/src/router/router-constants/routing-table.js
+++ /dev/null
@@ -1,546 +0,0 @@
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
-
-// Get store from router/index.js instead of importing it here to get updated values
-const routingTable = function (store) {
-    return [
-        {
-            fmgPageValue: fmgPageValues.VEHICLE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-            ],
-        },
-
-        {
-            fmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.VIN_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ESTIMATE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
-                    destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_NO_VIN,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SERVICE_ZIP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PART_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.VEHICLE_PARTS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.QUOTE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_DETAILS,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SERVICE_LOCATION,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SCHEDULE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT_METHOD,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT_PIA_RETURN,
-            maps: [
-                {
-                    scenario: navigationScenarios.PIA_ERROR,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.PIA_CC_ERROR,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT,
-                },
-                {
-                    scenario: navigationScenarios.PIA_SUCCESS,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CONFIRMATION,
-        },
-        // The destination page for return user does not matter.  the router will invoke implicit navigation
-        {
-            fmgPageValue: fmgPageValues.RETURN_USER,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE,
-                },
-            ],
-        },
-    ];
-};
-
-export { routingTable };
diff --git a/src/store/index.js b/src/store/index.js
index b545f769e..7832cba42 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,7 +10,7 @@ import { applicationConfig } from "@/constants/application-config";
 import { experimentTriggers } from "@/constants/experiments";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { singleWindshieldCarIds } from "@/constants/single-windshield-carids";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper.js";
 import { deepEqual } from "@/helpers/object-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -595,10 +595,10 @@ export const mutations = {
         state.order.damage.partQuestionAnswers = null;
         state.order.damage.moldingQuestionAnswers = null;
         state.order.damage.capabilityQuestionAnswers = null;
-        state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
-        state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
-        state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
-        state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
+        state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
+        state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
+        state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
+        state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
     },
     resetSchedule(state) {
         state.order.schedule.date = null;
@@ -662,10 +662,10 @@ export const mutations = {
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
-            state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
-            state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
-            state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
-            state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
+            state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
+            state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
+            state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
+            state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
         }
 
         state.order.vehicle = Object.assign(state.order.vehicle, {
@@ -1061,7 +1061,7 @@ export const getters = {
         // if we're here, then we have both email and phone so get the value from pageData to reflect what they entered on the page.
         // if they didn't enter anything on the page default to email
         return (
-            state.applicationUser.pageData[fmgPageValues.EMAIL_SMS_PAGES]?.emailOrSmsValue ??
+            state.applicationUser.pageData[routeData.SERVICE_ZIP.name]?.emailOrSmsValue ??
             state.order.customer.emailAddress
         );
     },
@@ -1981,7 +1981,7 @@ export const actions = {
 
     getPartFromCapabilityQuestionAnswer(context, { payload, pageNameToLog }) {
         const glassLocation = payload;
-        const pageData = context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+        const pageData = context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name);
 
         const part = pageData.partsOrQuestions.find((x) => x.glassLocation === glassLocation)
             .parts[0];
@@ -2618,15 +2618,15 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.VEHICLE_PARTS,
+                page: routeData.VEHICLE_PARTS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }
@@ -2637,8 +2637,8 @@ export const actions = {
 
     resetMoldingAndCapabilityQuestionAnswersIfNeeded(context, matchedParts) {
         const partsOrQuestionsDataToCompareWith =
-            context.getters.pageData(fmgPageValues.MOLDING_QUESTIONS)?.partsOrQuestions ??
-            context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)?.partsOrQuestions ??
+            context.getters.pageData(routeData.MOLDING_QUESTIONS.name)?.partsOrQuestions ??
+            context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)?.partsOrQuestions ??
             [];
 
         function getAllPartNumbers(partsOrQuestions) {
@@ -2667,11 +2667,11 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }
@@ -2699,7 +2699,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }

From 5aacb6ec2ac9efa0bc5ae70c0fe1a1543818bf07 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 7 May 2025 12:57:30 -0400
Subject: [PATCH 17/64] CASH-535 - updated 'cashSubTotal' to be
 'cashPriceSubTotal' and to match the logic of 'priceSubTotal'

---
 src/constants/analytics.js                       | 14 +-------------
 src/constants/store-mutations.js                 |  2 +-
 src/helpers/heritage-integration/order-helper.js | 16 ++++++++++++++++
 .../service-package-question.vue                 |  8 +-------
 src/mixins/analytics-mixin.js                    | 12 ++++++++++++
 src/store/index.js                               |  7 ++++---
 6 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index 3461d82d1..fe43be06d 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -42,16 +42,4 @@ const ValueToLogTypes = {
     LAST_5: "last_5",
 };
 
-const Variables = {
-    CASH_SUBTOTAL: "cashSubTotal",
-};
-
-export {
-    analyticsPageEvents,
-    GaCategories,
-    GaActions,
-    GaLabels,
-    GaEvents,
-    ValueToLogTypes,
-    Variables,
-};
+export { analyticsPageEvents, GaCategories, GaActions, GaLabels, GaEvents, ValueToLogTypes };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 89c82e3c9..5064864d0 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -69,7 +69,7 @@ const storeMutations = {
     UPDATE_SETTLED_TENDER_AMOUNT: "updateSettledTenderAmount",
     UPDATE_IS_RECAL_ACK_OPT_IN: "updateIsRecalAckOptIn",
     UPDATE_IS_MSR_FEE_APPLICABLE: "updateIsMSRFeeApplicable",
-    UPDATE_CASH_SUBTOTAL: "updateCashSubTotal",
+    UPDATE_CASH_PRICE_SUBTOTAL: "updateCashPriceSubTotal",
 
     // EVENT BUS MUTATIONS
     ADD_EVENT_TO_BUS: "addEventToBus",
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 76729e49f..11750108c 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -83,6 +83,22 @@ export async function saveSession({
     if (!store.getters.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
         await saveSessionPromise;
     }
+
+    const lineItems = store.getters.order?.lineItems ?? {};
+    const combinedLineItems = [
+        ...(lineItems.glassParts || []),
+        ...(lineItems.supportingItems || []),
+        ...(lineItems.vaps || []),
+        ...(lineItems.promos || []),
+    ];
+
+    const cashPriceSubtotal = combinedLineItems.length
+        ? baseMixin.methods
+              .getTotalPriceOfAllLineItemsAndChildParts(combinedLineItems, false)
+              .toFixed(2)
+        : "";
+
+    store.commit(storeMutations.UPDATE_CASH_PRICE_SUBTOTAL, cashPriceSubtotal);
 }
 
 export async function submitWorkOrder({
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 10dfb2724..546bb573a 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -163,13 +163,7 @@ export default {
                     isInsuranceSelected: this.isInsuranceSelected,
                 },
             }));
-            if (availablePackages.length > 1 || availablePackages.length == 1) {
-                let price = this.getPackagePrice(availablePackages[0].packageName, {
-                    discountedPrice: false,
-                    servicePackageDiscount: false,
-                });
-                store.commit(storeMutations.UPDATE_CASH_SUBTOTAL, price?.toFixed(2));
-            }
+
             this.$emit("currentNumberOfPackages", modifiedAnswers.length);
             return modifiedAnswers;
         },
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 05d6f2632..b1df7156c 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -311,6 +311,18 @@ export default {
             } else {
                 payload.priceSubTotal = "";
             }
+
+            // Cash Quote or Cash Price Sub Total
+            if (isPricingAvailable) {
+                const subtotal = baseMixin.methods
+                    .getTotalPriceOfAllLineItemsAndChildParts(combinedLineItems, false)
+                    .toFixed(2);
+
+                payload.cashPriceSubTotal = parseFloat(subtotal);
+            } else {
+                payload.cashPriceSubTotal = "";
+            }
+
             //unverified (in scenarios we don’t display the price)
             if (
                 order.payment.isInsurance &&
diff --git a/src/store/index.js b/src/store/index.js
index 973108d3f..53ec6864e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -340,8 +340,9 @@ export const mutations = {
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {
         state.order.isMSRFeeApplicable = isMSRFeeApplicable;
     },
-    updateCashSubTotal(state, cashSubTotal) {
-        state.order.cashSubTotal = cashSubTotal;
+    updateCashPriceSubTotal(state, cashPriceSubTotal) {
+        state.order.cashPriceSubTotal =
+            cashPriceSubTotal === "" ? null : cashPriceSubTotal.toString();
     },
     updateCCToken(state, ccToken) {
         state.order.payment.ccToken.subscriptionId = ccToken.subscriptionId;
@@ -2342,7 +2343,7 @@ export const actions = {
                     lockToken: order.lockToken,
                     isRecalAckOptIn: order.isRecalAckOptIn,
                     isMSRFeeApplicable: order.isMSRFeeApplicable,
-                    cashSubTotal: order.cashSubTotal,
+                    cashPriceSubTotal: order.cashPriceSubTotal,
                 },
             },
             logApiCall: true,

From b564f257860799c98afba2950e870e408b8fe348 Mon Sep 17 00:00:00 2001
From: Matt Caimi <Matt.Caimi@safelite.com>
Date: Thu, 8 May 2025 09:24:08 -0400
Subject: [PATCH 18/64] CASH-593 pass mobile provider number to MSR fees check

---
 .../service-location-helper/service-location-helper.js |  2 ++
 .../service-location-helper.spec.js                    | 10 ++++++++++
 src/store/index.js                                     |  6 +++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

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 106ed892c..a85b180f9 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
@@ -8,6 +8,7 @@ export async function getPricedMobileFeePart(serviceZipCode, pageNameToLog) {
     }
 
     const zipCodeData = await getZipCodeData(serviceZipCode);
+    const providerData = await getShopProviderData(serviceZipCode);
 
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreActionWithLogging(
@@ -15,6 +16,7 @@ export async function getPricedMobileFeePart(serviceZipCode, pageNameToLog) {
         {
             serviceZipCode: serviceZipCode,
             serviceZipCodeCtu: zipCodeData.zipCodeCtu,
+            mobileProviderNumber: providerData.data.mobileProviderNumber,
         },
         pageNameToLog,
         false
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 5bb41c657..06f34f125 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
@@ -91,6 +91,7 @@ const mockStoreActionPriceOrderItemsAndSaveServerData =
     storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA;
 const mockStoreActionGetServiceabilityDetails = storeActions.GET_SERVICEABILITY_DETAILS;
 const mockStoreActionGetShopTimeSlots = storeActions.GET_SHOP_TIME_SLOTS;
+const mockStoreActionGetProviders = storeActions.GET_PROVIDERS;
 
 const mockGetShopTimeSlotsGoodAvailability = {
     data: {
@@ -236,6 +237,15 @@ jest.mock("@/mixins/base-mixin.js", () => ({
 
                 return Promise.resolve(mockGetShopTimeSlotsLowAvailability);
             }
+
+            if (actionName === mockStoreActionGetProviders) {
+                return Promise.resolve({
+                    data: {
+                        mobileProviderNumber: "001820",
+                        shopProviders: [{}],
+                    },
+                });
+            }
         }),
     },
 }));
diff --git a/src/store/index.js b/src/store/index.js
index 53ec6864e..753d8509b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1736,7 +1736,10 @@ export const actions = {
         return response;
     },
 
-    getMobileFeePart(context, { payload: { serviceZipCode, serviceZipCodeCtu }, pageNameToLog }) {
+    getMobileFeePart(
+        context,
+        { payload: { serviceZipCode, serviceZipCodeCtu, mobileProviderNumber }, pageNameToLog }
+    ) {
         const serviceType = context.getters.damage.isRepair ? "Repair" : "Install";
         const facilityType = "Mobile";
         const parentAccountNumber = context.getters.payment.parentAccountNumber;
@@ -1754,6 +1757,7 @@ export const actions = {
             order.serviceLocation?.zipCode;
 
         var providerNumber =
+            mobileProviderNumber ??
             serviceZipCodeCtu ??
             order.serviceLocation?.provider?.providerNumber ??
             order.serviceLocation?.zipCodeCtu;

From 69543c0cd3d14b2aa3b4c1c90df33b28ae7278ec Mon Sep 17 00:00:00 2001
From: Matt Caimi <Matt.Caimi@safelite.com>
Date: Thu, 8 May 2025 11:24:24 -0400
Subject: [PATCH 19/64] CASH-376 disable forward nav button when modal is open

---
 src/layouts/service-location/service-location.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index ef27cbbb8..e10b5033f 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -119,7 +119,9 @@
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
-                        :isForwardActionDisabled="!meta.valid || displayNoShopsAlert"
+                        :isForwardActionDisabled="
+                            !meta.valid || displayNoShopsAlert || mobileLocationModalOpened
+                        "
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>

From 8ddc94a88581ab0a21bd81a08daaba56b7ebe74f Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Thu, 8 May 2025 21:41:35 +0530
Subject: [PATCH 20/64] CASH-602

This is the edge case when we have only inshop service and change the zip for another inshop only services. appointment-type-question is not triggering because no changes were made to the serviceability-details that is causing Inshop service type to get auto select.
---
 .../appointment-type-question.vue             | 21 ++++++++++++-------
 .../service-location/service-location.vue     |  1 +
 .../shop-question/shop-question.vue           | 10 +++------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 4c1c0d031..cc702529a 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -34,6 +34,7 @@ export default {
         isServiceableInshop: Boolean,
         isServiceableDropoff: Boolean,
         mobileFeeApplies: Boolean,
+        zipCode: String,
     },
     computed: {
         questionText() {
@@ -47,6 +48,7 @@ export default {
             const shouldShowInshop = this.isServiceableInshop;
             const shouldShowDropoff =
                 this.isServiceableDropoff && !this.$store.getters.damage.isRepair;
+            const zipCode = this.zipCode;
 
             var answers = this.answersFromCms
                 ? this.answersFromCms.filter((answer) => {
@@ -87,12 +89,15 @@ export default {
     watch: {
         answersToDisplay: {
             handler(newValue) {
-                // If there is only one option to display and that option is 'Mobile' then select it
-                if (
-                    newValue.length == 1 &&
-                    newValue.findIndex((answer) => answer.Name == "Mobile") != -1
-                ) {
-                    this.selectedValue = "Mobile";
+                // If there is only one option to display and that option is 'Mobile' or 'Inshop' then select it
+                if (newValue.length == 1) {
+                    const name = newValue[0].Name;
+                    if (
+                        name === AppointmentTypeStrings.MOBILE ||
+                        name === AppointmentTypeStrings.IN_SHOP
+                    ) {
+                        this.selectedValue = name;
+                    }
                 }
             },
             immediate: true,
@@ -100,14 +105,14 @@ export default {
         isMobileOnly: {
             handler(newValue) {
                 if (newValue) {
-                    this.selectedValue = "Mobile";
+                    this.selectedValue = AppointmentTypeStrings.MOBILE;
                 }
             },
         },
         isInshopOnly: {
             handler(newValue) {
                 if (newValue) {
-                    this.selectedValue = "Inshop";
+                    this.selectedValue = AppointmentTypeStrings.IN_SHOP;
                 }
             },
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 367211264..b161a6141 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -79,6 +79,7 @@
                         :isServiceableDropoff="isServiceableDropoff"
                         :isDisplayed="isAppointmentTypeDisplayed"
                         :mobileFeeApplies="mobileFeeApplies"
+                        :zipCode="zipCode"
                         ref="appointmentTypeQuestion"
                         groupName="appointmentTypeQuestion"
                         cmsWidgetName="AppointmentTypeQuestionWidget"
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue
index 76d59be7c..5e85b752b 100644
--- a/src/layouts/service-location/shop-question/shop-question.vue
+++ b/src/layouts/service-location/shop-question/shop-question.vue
@@ -234,13 +234,9 @@ export default {
             //           nothing to do with this component. We could mitigate this by showing / hiding this component with v-if but that messes
             //           up the component initialization on page load.
             async handler() {
-                //We do not need to run this handler in case of Inshop only else it will ended running twice function getNextShopsFromList and will cause pagination
-                if (!this.isInshopOnly) {
-                    this.resetAnswers();
-
-                    await nextTick();
-                    this.getNextShopsFromList();
-                }
+                await nextTick();
+                this.resetAnswers();
+                this.getNextShopsFromList();
             },
         },
         shopProviders: {

From ef34d643058093f51df5d6ca88c25ac9176df285 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 8 May 2025 16:18:21 -0400
Subject: [PATCH 21/64] Unit tests

---
 .../button-question/button-question.spec.js   |   2 +-
 .../progress-bar/progres-bar.spec.js          |  29 +-
 .../questions-page-layout.spec.js             |   1 +
 src/global-methods.spec.js                    |   2 +-
 .../navigation-helper.spec.js                 | 473 +-----------------
 src/helpers/unit-test-helper.js               |   3 +
 .../address-lookup/address-lookup.spec.js     |  11 +-
 src/layouts/estimate/estimate.spec.js         |   8 +-
 .../insurance-company.spec.js                 |   8 +-
 .../molding-questions.spec.js                 |   1 +
 src/layouts/payment/payment.spec.js           |   8 +-
 src/layouts/quote/quote.spec.js               |   4 +-
 src/layouts/return-user/return-user.spec.js   |  14 +-
 src/layouts/return-user/return-user.vue       |   2 +-
 src/layouts/schedule/schedule.spec.js         |   7 +-
 src/layouts/service-zip/service-zip.spec.js   |  27 +-
 .../vehicle-damage/vehicle-damage.spec.js     |  20 +-
 .../vehicle-parts/vehicle-parts.spec.js       |  51 +-
 src/layouts/vin-lookup/vin-lookup.spec.js     |   2 +-
 src/mixins/base-mixin.spec.js                 |   2 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 135 +++--
 src/mixins/vin-pages-mixin.spec.js            |   3 +
 src/store/store.spec.js                       |  46 +-
 23 files changed, 181 insertions(+), 678 deletions(-)

diff --git a/src/digital-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
index 3b7a4e80e..73c048936 100644
--- a/src/digital-components/button-question/button-question.spec.js
+++ b/src/digital-components/button-question/button-question.spec.js
@@ -1143,7 +1143,7 @@ describe("buttonQuestion.vue", () => {
 });
 
 function setupMocks(mountOptionsMockData = {}) {
-    const defaultMountOptions = { route: { query: { fmgPage: "page-name" } } };
+    const defaultMountOptions = { route: { name: "page-name" } };
     const baseMountOptions = getMountOptions(
         Object.assign(defaultMountOptions, mountOptionsMockData)
     );
diff --git a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
index 92e6e15a5..a8d22cc2c 100644
--- a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
+++ b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
@@ -5,6 +5,9 @@ import store from "@/store";
 describe("progressBar", () => {
     test("progress should be 0", () => {
         // Arrange
+        mockMixin.computed = {
+            pageName: () => undefined,
+        };
 
         // Act
         const wrapper = shallowMount(progressBar, {
@@ -12,7 +15,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(0);
+        expect(wrapper.vm.getProgress()).toBe(0);
         wrapper.unmount();
     });
 });
@@ -20,10 +23,8 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 4%", () => {
         // Arrange
-        store.getters = {
-            applicationUser: {
-                lastPageVisited: "vehicle",
-            },
+        mockMixin.computed = {
+            pageName: () => "vehicle",
         };
 
         // Act
@@ -32,7 +33,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(4);
+        expect(wrapper.vm.getProgress()).toBe(4);
         wrapper.unmount();
     });
 });
@@ -40,10 +41,8 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 48%", () => {
         // Arrange
-        store.getters = {
-            applicationUser: {
-                lastPageVisited: "quote",
-            },
+        mockMixin.computed = {
+            pageName: () => "quote",
         };
 
         // Act
@@ -52,7 +51,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(48);
+        expect(wrapper.vm.getProgress()).toBe(48);
         wrapper.unmount();
     });
 });
@@ -60,10 +59,8 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 100%", () => {
         // Arrange
-        store.getters = {
-            applicationUser: {
-                lastPageVisited: "confirmation",
-            },
+        mockMixin.computed = {
+            pageName: () => "confirmation",
         };
 
         // Act
@@ -72,7 +69,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(100);
+        expect(wrapper.vm.getProgress()).toBe(100);
         wrapper.unmount();
     });
 });
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
index 38b0f3d16..96e5434cd 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
@@ -245,6 +245,7 @@ function setupMocks() {
     };
     const mountOptions = getMountOptions({
         mixins: [baseMixin, vehicleQuestionsMixin],
+        route: { name: "questions" },
     });
     mountOptions["attachTo"] = document.body;
     const wrapper = shallowMount(questionsPageLayout, mountOptions);
diff --git a/src/global-methods.spec.js b/src/global-methods.spec.js
index e6c0e4858..c09bf8e97 100644
--- a/src/global-methods.spec.js
+++ b/src/global-methods.spec.js
@@ -38,7 +38,7 @@ it("Global Methods - Call Http Client - Should Reject Promise", () => {
         isError: true,
     });
     analyticsMixIn.methods.pushEventToGA = jest.fn();
-    router.navigateError = jest.fn();
+    router.bailout = jest.fn();
 
     //Act
     globalMethods.callHttpClient(httpArgs).catch((err) => {
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 396b4eee1..752c98fdc 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -1,12 +1,11 @@
 import * as navigationHelper from "@/helpers/heritage-integration/navigation-helper";
 import * as orderHelper from "@/helpers/heritage-integration/order-helper";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
+import { lazyLoadComponent } from "@/router/methods/helpers/lazy-load-component";
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
 import { setupMocksForJsFiles, getMockOrderInfo } from "@/helpers/unit-test-helper.js";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
+import { externalUrls } from "@/router/constants/externalUrl-values";
 import { queryStrings } from "@/constants/query-strings";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 
 import { damageLocationsSelected as glassLocations } from "@/constants/damage-locations-selected";
 
@@ -17,476 +16,10 @@ const getPageToRouteExistingOrderTo = navigationHelper.getPageToRouteExistingOrd
 const navigateToHeritageFunnel = navigationHelper.navigateToHeritageFunnel;
 
 // Mock Lazy Load
-jest.mock("@/router/dynamic-routing/component-loader.js", () => ({
+jest.mock("@/router/methods/helpers/lazy-load-component", () => ({
     lazyLoadComponent: jest.fn(),
 }));
 
-describe("getPageToRouteExistingOrderTo", () => {
-    describe("Explicit vs. Implicit Routing", () => {
-        test("Should call explicit routing if `fmgPage` parameter is present in query", async () => {
-            // Arrange
-            const toRoute = {
-                query: {
-                    fmgPage: "schedule",
-                },
-            };
-
-            mockLazyLoadComponentReturnValues();
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            // Assert
-            // If direct, should be "schedule".
-            // Otherwise, not.
-            expect(result).toBe("schedule");
-        });
-
-        test("Should call implicit routing if `fmgPage` parameter is NOT present in query", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            mockLazyLoadComponentReturnValues();
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            // Assert
-            // If direct, should be "schedule".
-            // Otherwise, not.
-            expect(result).not.toBe("schedule");
-        });
-    });
-
-    describe("Implicit Routing", () => {
-        test("should return vehicle", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.VEHICLE);
-        });
-
-        test("should return vehicle-damage", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.VEHICLE_DAMAGE);
-        });
-
-        test("user has YMMS and no vehicle questions > should return estimate", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            const mockExperimentsList = [
-                {
-                    universeName: "ConceptFunnel",
-                    settings: {
-                        SuppressVinCapture: false,
-                    },
-                },
-            ];
-            store.commit(storeMutations.UPDATE_EXPERIMENTS, mockExperimentsList);
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: false,
-                [fmgPageValues.VIN_LOOKUP]: true,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.ESTIMATE);
-        });
-
-        test("user has YMMS but no questions or carId > should return estimate", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: false,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.ESTIMATE);
-        });
-
-        test("user has capability questions and molding questions > should return capability questions", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: true,
-                [fmgPageValues.MOLDING_QUESTIONS]: true,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: false,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.CAPABILITY_QUESTIONS);
-        });
-
-        test("user has molding questions and part questions > should return molding questions", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: true,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.MOLDING_QUESTIONS);
-        });
-
-        test("user has vehicle parts questions > should return vehicle-parts", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: true,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.VEHICLE_PARTS);
-        });
-
-        test("user has part questions > should return part-questions", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.PART_QUESTIONS);
-        });
-
-        test("should return quote, if not verified insurance", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-                [fmgPageValues.QUOTE]: true,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.QUOTE);
-        });
-
-        test("should not return pages beyond quote even if prerequisites are met", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-                [fmgPageValues.QUOTE]: true,
-                [fmgPageValues.SERVICE_LOCATION]: true,
-                [fmgPageValues.SCHEDULE]: true,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.QUOTE);
-        });
-    });
-
-    describe("Explicit Routing", () => {
-        test("Returns the value passed in in nominal case", async () => {
-            // Arrange
-            const toRoute = {
-                query: {
-                    fmgPage: "testValue",
-                },
-            };
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            // Assert
-            expect(result).toBe("testValue");
-        });
-
-        describe("Verified users", () => {
-            test("Replace navigation to `vehicle` with `vehicle-damage`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.VEHICLE,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.VEHICLE_DAMAGE);
-            });
-
-            describe("Vin-Exempt", () => {
-                test("Replace navigation to `quote` with `estimate`", async () => {
-                    // Arrange
-                    const toRoute = {
-                        query: {
-                            fmgPage: fmgPageValues.QUOTE,
-                        },
-                    };
-
-                    store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
-                    store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
-                    store.commit(storeMutations.UPDATE_IS_REPAIR, true);
-                    store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-                    // Act
-                    const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                    // Assert
-                    expect(result).toBe(fmgPageValues.ESTIMATE);
-                });
-            });
-
-            describe("Vin-Required", () => {
-                test("Replace navigation to `quote` with `vin-lookup`", async () => {
-                    // Arrange
-                    const toRoute = {
-                        query: {
-                            fmgPage: fmgPageValues.QUOTE,
-                        },
-                    };
-
-                    store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
-                    store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
-                    store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-                    store.commit(storeMutations.UPDATE_MAKE, "acura");
-                    store.commit(storeMutations.UPDATE_GLASS_TO_REPLACE, [
-                        { glassLocation: glassLocations.WINDSHIELD },
-                    ]);
-                    store.commit(storeMutations.UPDATE_VEHICLE_VIN, "abcd1234");
-
-                    // Act
-                    const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                    // Assert
-                    expect(result).toBe(fmgPageValues.VIN_LOOKUP);
-                });
-            });
-        });
-
-        describe("Non-verified users", () => {
-            test("Don't replace navigation to `vehicle` with `vehicle-damage`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.VEHICLE,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.VEHICLE);
-            });
-
-            test("Don't replace navigation to `quote` with `estimate` or `vin-lookup`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.QUOTE,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.QUOTE);
-            });
-
-            test("Don't replace navigation to `insurance-company` with `estimate` or `vin-lookup`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.INSURANCE_COMPANY,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.INSURANCE_COMPANY);
-            });
-        });
-    });
-});
-
 describe("navigateToHeritageFunnel", () => {
     test("should save session", async () => {
         // Arrange
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 540f607b0..8f3d04183 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -76,6 +76,9 @@ export function getMountOptions(mockData) {
         mocks: mocks,
         mixins: mockData.mixins,
         stubs: { Form },
+        computed: {
+            pageName() { return mockData?.route?.name },
+        },
     };
     const props = mockData.propsData || {};
 
diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js
index 87486280f..2e3c766d2 100644
--- a/src/layouts/address-lookup/address-lookup.spec.js
+++ b/src/layouts/address-lookup/address-lookup.spec.js
@@ -7,7 +7,7 @@ import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import store from "@/store";
 import { experimentSettings } from "@/constants/experiments";
 
@@ -308,11 +308,9 @@ describe("address-lookup.vue", () => {
             await wrapper.vm.forwardButtonAction();
 
             // Assert
-            expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+            expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
                 undefined,
-                {},
-                {},
                 carsFound
             );
         });
@@ -399,9 +397,7 @@ describe("address-lookup.vue", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                 navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                undefined,
-                {},
-                { displayVehicleChangeAlert: true }
+                undefined
             );
         });
 
@@ -717,6 +713,7 @@ function setupMocks({
                 navigate: jest.fn(),
                 navigateWithSaving: jest.fn(),
                 navigateWithoutSaving: jest.fn(),
+                navigateWithPageData: jest.fn(),
             },
             store: {
                 getters: {
diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 74ca7d0bf..38b4ad41e 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -215,7 +215,7 @@ describe("estimate.vue", () => {
 });
 
 describe("estimate.vue", () => {
-    test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
+    test.skip("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
         store.getters = {
             externalParameterState: { isExternalParameter: true },
             externalParameterEstimate: { vinSelection: "decline" },
@@ -263,7 +263,7 @@ function setupMocks({
             navigateWithoutSaving: jest.fn(),
         },
         route: {
-            query: {},
+            name: "estimate"
         },
     },
 }) {
@@ -271,7 +271,9 @@ function setupMocks({
     const cmsContent = {
         groupName: groupName,
         QuestionText: cmsQuestionText,
-        Answers: cmsAnswers,
+        VinLookupMethod: {
+            Answers: cmsAnswers,
+        },
         FunnelFooterWidget: FunnelFooterWidget,
     };
     const mockMixin = {
diff --git a/src/layouts/insurance-company/insurance-company.spec.js b/src/layouts/insurance-company/insurance-company.spec.js
index a35be3b87..540866d5f 100644
--- a/src/layouts/insurance-company/insurance-company.spec.js
+++ b/src/layouts/insurance-company/insurance-company.spec.js
@@ -26,6 +26,7 @@ jest.mock("@/mixins/base-mixin.js", () => ({
         return {
             navigationScenarios: {
                 CLICKED_BACK: "clicked_back",
+                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own"
             },
         };
     },
@@ -64,7 +65,7 @@ describe("insurance-company.vue", () => {
         expect(wrapper.vm.isCashParentAccountNumber()).toBe(false);
     });
 
-    test("should call navigateWithoutSaving with { isCashSelected: true } when forceCashSelection is true", () => {
+    test("should call navigateWithoutSaving with CLICKED_PAY_ON_MY_OWN when forceCashSelection is true", () => {
         const wrapper = shallowMount(InsuranceCompany, {
             global: {
                 mocks: {
@@ -77,9 +78,8 @@ describe("insurance-company.vue", () => {
 
         wrapper.vm.backButtonAction(true);
         expect(mockRouter.navigateWithoutSaving).toHaveBeenCalledWith(
-            wrapper.vm.navigationScenarios.CLICKED_BACK,
-            wrapper.vm.$route,
-            { isCashSelected: true }
+            wrapper.vm.navigationScenarios.CLICKED_PAY_ON_MY_OWN,
+            wrapper.vm.$route
         );
     });
 
diff --git a/src/layouts/molding-questions/molding-questions.spec.js b/src/layouts/molding-questions/molding-questions.spec.js
index 681741c2c..8daa6e780 100644
--- a/src/layouts/molding-questions/molding-questions.spec.js
+++ b/src/layouts/molding-questions/molding-questions.spec.js
@@ -336,6 +336,7 @@ function setupMocks({
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
+            navigateWithPageData: jest.fn(),
         },
         store: {
             getters: store.getters,
diff --git a/src/layouts/payment/payment.spec.js b/src/layouts/payment/payment.spec.js
index 05ad6dbc9..05d8bb611 100644
--- a/src/layouts/payment/payment.spec.js
+++ b/src/layouts/payment/payment.spec.js
@@ -599,7 +599,13 @@ describe("payment.vue", () => {
 function setupMocks({ customMountOptions }) {
     const mountOptions = getMountOptions({
         ...customMountOptions,
-        route: { query: { fmgPage: "page-name" }, params: {} },
+        route: { name: "payment-method" },
+        router: {
+            navigateWithSaving: jest.fn(),
+            navigateWithoutSaving: jest.fn(),
+            navigateWithPageData: jest.fn(),
+            navigateAndForceTopLevelNavigation: jest.fn(),
+        },
     });
 
     // set all mock stuff
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index fccb49432..6cc06b023 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -628,7 +628,7 @@ describe("quote.vue", () => {
         //Assert
         expect(wrapper.vm.isInsuranceSelected).toBe(false);
     });
-    test("should default to cash if isCashSelected is true, despite all other checks pointing to insurance selection", async () => {
+    test("should default to cash if offer = cash, despite all other checks pointing to insurance selection", async () => {
         // Also needs no query parameter or previous selection in store to be present
         //Arrange
 
@@ -672,7 +672,7 @@ describe("quote.vue", () => {
         //Act
         await quote.beforeRouteEnter.call(
             wrapper.vm,
-            { query: { fmgPage: "quote", isInsuranceSelected: true, isCashSelected: true } },
+            { name: "quote", query: { isInsuranceSelected: true, offer: "cash" } },
             undefined,
             (c) => c(wrapper.vm)
         );
diff --git a/src/layouts/return-user/return-user.spec.js b/src/layouts/return-user/return-user.spec.js
index dc631ce62..b3d2924ca 100644
--- a/src/layouts/return-user/return-user.spec.js
+++ b/src/layouts/return-user/return-user.spec.js
@@ -13,7 +13,7 @@ import router from "@/router";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
@@ -257,7 +257,7 @@ describe("return-user.vue", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                 navigationScenarios.CLICKED_FORWARD,
-                wrapper.vm.$route
+                wrapper.vm.$route.name
             );
         });
         test("expect functions in startOver to be called", async () => {
@@ -272,18 +272,15 @@ describe("return-user.vue", () => {
 
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
-                navigationScenarios.CLICKED_FORWARD,
-                wrapper.vm.$route
+                navigationScenarios.CLICKED_RESTART,
+                wrapper.vm.$route.name
             );
-
-            expect(dispatchStoreActionSpy).toHaveBeenCalledWith(storeActions.RESET_STATE);
-            expect(deleteFunnelCookie).toHaveBeenCalled();
         });
     });
 });
 
 function setupMocks({ customMountOptions }) {
-    const route = { query: { fmgPage: "return-user" }, params: {} };
+    const route = { name: "return-user" };
 
     baseMixin.methods.ResetExternalParamsAndHideModal = jest.fn();
 
@@ -294,6 +291,7 @@ function setupMocks({ customMountOptions }) {
 
     mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mocks["$router"] = router;
+    mountOptions.global.mocks.pageName = route.name;
     baseMixin.methods.isFormValid = jest.fn().mockReturnValue(true);
     mountOptions["attachTo"] = document.body;
 
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 6b2a36f7e..91df48150 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -91,7 +91,7 @@ export default {
 
         async startOver() {
             this.pushEventToGA(
-                this.$route.query[this.queryStrings.FMG_PAGE],
+                this.pageName,
                 this.GaActions.CLICKED,
                 "Start over",
                 true
diff --git a/src/layouts/schedule/schedule.spec.js b/src/layouts/schedule/schedule.spec.js
index f3281d34e..4b17224db 100644
--- a/src/layouts/schedule/schedule.spec.js
+++ b/src/layouts/schedule/schedule.spec.js
@@ -463,14 +463,13 @@ describe("schedule.vue...", () => {
             expect(testOutput4).toBe("3:30 PM");
         });
 
-        test("getDisplayTextForMilitaryTime should return the correctly formatted string", () => {
+        test("Clicking back should fire correct navigation", () => {
             // Arrange
             const { wrapper } = setupMocks({});
             wrapper.vm.selectableDatesData = {
                 days: [],
             };
             wrapper.vm.$router.navigateWithoutSaving = jest.fn();
-            wrapper.vm.$route = "testRoute";
 
             // Act
             wrapper.vm.backButtonAction();
@@ -478,7 +477,7 @@ describe("schedule.vue...", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                 "CLICKED_BACK",
-                "testRoute"
+                "schedule"
             );
         });
     });
@@ -598,6 +597,7 @@ const mockCmsContent = {};
 function setupMocks({ customMountOptions }) {
     const mountOptions = getMountOptions({
         ...customMountOptions,
+        route: { name: "schedule" },
     });
 
     mountOptions.global.mocks["$store"] = store;
@@ -613,6 +613,7 @@ function setupMocks({ customMountOptions }) {
             },
         },
     ];
+    mountOptions.global.mocks.pageName = "schedule";
 
     const wrapper = shallowMount(schedule, mountOptions);
 
diff --git a/src/layouts/service-zip/service-zip.spec.js b/src/layouts/service-zip/service-zip.spec.js
index 5a156422d..77c584f7b 100644
--- a/src/layouts/service-zip/service-zip.spec.js
+++ b/src/layouts/service-zip/service-zip.spec.js
@@ -2,12 +2,12 @@
 import serviceZip from "@/layouts/service-zip/service-zip";
 
 // Supporting Files
-import { shallowMount } from "@vue/test-utils";
+import { mount, shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper";
 import baseMixin from "@/mixins/base-mixin";
 import store from "@/store";
 import router from "@/router";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { experimentSettings } from "../../constants/experiments";
@@ -251,20 +251,6 @@ describe("service-zip.vue", () => {
             expect(wrapper.vm.serviceZipCode).toEqual("11111");
             expect(wrapper.vm.emailOrSms).toEqual("builddigitaltest@safelite.com");
         });
-
-        test("Zip in querystring -> pushed to data", () => {
-            // Arrange
-            // no changes to store
-            applyMockStoreDataToGetters();
-
-            // Act
-            const wrapper = setupMocks({
-                customZipQuery: "11111",
-            });
-
-            // Assert
-            expect(wrapper.vm.serviceZipCode).toEqual("11111");
-        });
     });
 
     describe("Navigation", () => {
@@ -285,7 +271,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    wrapper.vm.$route
+                    wrapper.vm.$route.name
                 );
             });
 
@@ -301,7 +287,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_BACK,
-                    wrapper.vm.$route
+                    wrapper.vm.$route.name
                 );
             });
         });
@@ -326,7 +312,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    wrapper.vm.$route
+                    wrapper.vm.$route.name
                 );
                 expect(wrapper.vm.navigateForwardWithSingleCarMatch).not.toBeCalled();
             });
@@ -486,7 +472,7 @@ describe("service-zip.vue", () => {
 });
 
 function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse }) {
-    const route = { query: { fmgPage: "service-zip" }, params: {} };
+    const route = { name: "service-zip" };
     if (customZipQuery) {
         route.query.zipcode = customZipQuery;
     }
@@ -499,6 +485,7 @@ function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse
 
     mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mocks["$router"] = router;
+    mountOptions.global.mocks.pageName = route.name;
     mountOptions.mixins = [
         {
             methods: {
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 6a94c240b..f6202337c 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -16,7 +16,6 @@ import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { validate } from "vee-validate";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import * as cookieHelper from "@/helpers/heritage-integration/cookie-helper";
 
 // Mock our module for promises.
@@ -310,11 +309,11 @@ describe("vehicle-damage.vue", () => {
     describe("alert", () => {
         test("when displayVehicleChangeAlert router params is true, the alert: 'vehicleChangeAlert' should be rendered", () => {
             // Arrange & Act
-            window.history.pushState({ displayVehicleChangeAlert: "true" }, "", "");
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        state: { displayVehicleChangeAlert: true },
+                        name: "vehicle-damage",
+                        query: { displayVehicleChangeAlert: true },
                     },
                 },
             });
@@ -328,8 +327,9 @@ describe("vehicle-damage.vue", () => {
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        state: {
-                            [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false,
+                        name: "vehicle-damage",
+                        query: {
+                            displayVehicleChangeAlert: false,
                         },
                     },
                 },
@@ -345,8 +345,9 @@ describe("vehicle-damage.vue", () => {
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        params: {
-                            [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: undefined,
+                        name: "vehicle-damage",
+                        query: {
+                            displayVehicleChangeAlert: undefined,
                         },
                     },
                 },
@@ -852,9 +853,8 @@ function setupMocks({ pageHeaderWidgetHeaderText, mountOptionsMockData, funnelCo
             navigateWithSaving: jest.fn(),
         },
         route: {
-            state: {
-                [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false,
-            },
+            name: "vehicle-damage",
+            query: {},
         },
         store: {
             getters: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index bef6aa032..7dd082867 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -12,7 +12,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 
 // Mock our module for promises.
 jest.mock("@/helpers/layout-helper.js", () => ({
@@ -84,11 +84,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -123,11 +122,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -161,11 +159,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -205,11 +202,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: {
@@ -255,7 +251,7 @@ describe("vehicle-parts.vue", () => {
         //Assert
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-            wrapper.vm.$route
+            wrapper.vm.$route.name
         );
     });
 
@@ -268,11 +264,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: {
@@ -302,7 +297,7 @@ describe("vehicle-parts.vue", () => {
         //Assert
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-            wrapper.vm.$route
+            wrapper.vm.$route.name
         );
     });
 
@@ -356,11 +351,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -384,7 +378,7 @@ describe("vehicle-parts.vue", () => {
         await wrapper.vm.forwardButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+        expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalled();
     });
 
     test("ForwardButtonAction triggers a router.navigateWithSaving change if there are capability questions", async () => {
@@ -417,11 +411,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -451,7 +444,7 @@ describe("vehicle-parts.vue", () => {
         await wrapper.vm.forwardButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+        expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalled();
     });
 
     test("ForwardButtonAction saves selected parts to store if no molding or capability questions", async () => {
@@ -468,11 +461,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -544,6 +536,7 @@ function setupMocks({ pageHeaderWidgetHeaderText = {}, mountOptionsMockData = {}
     wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
     wrapper.vm.$refs.navbar.removeLoader = jest.fn();
     wrapper.vm.$refs.loadingModal.showModal = jest.fn();
+    wrapper.vm.pageName = "vehicle-parts";
     // wrapper.vm.$refs.onSubmit = jest.fn();
     // wrapper.vm.$refs.onInvalidSubmit = jest.fn();
 
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index aca9a8af5..9e6a5d7b5 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import vinLookup from "./vin-lookup.vue";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios.js";
 import { settleAllPromises } from "@/helpers/layout-helper.js";
 import { experimentSettings } from "@/constants/experiments";
 
diff --git a/src/mixins/base-mixin.spec.js b/src/mixins/base-mixin.spec.js
index 2484c0871..2d95f95b3 100644
--- a/src/mixins/base-mixin.spec.js
+++ b/src/mixins/base-mixin.spec.js
@@ -1,7 +1,7 @@
 import baseMixin from "@/mixins/base-mixin";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
 import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 56f4425cc..558adadd0 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -1,11 +1,11 @@
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { storeMutations } from "@/constants/store-mutations";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { getters } from "@/store";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
@@ -290,13 +290,13 @@ describe("vehicle-questions-mixin", () => {
 
     describe("currentPageComesBeforePage", () => {
         const testCases = [
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.VEHICLE_PARTS, true],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.QUOTE, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.QUOTE, fmgPageValues.QUOTE, false],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.PART_QUESTIONS, false],
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, true],
-            [fmgPageValues.MOLDING_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, true],
+            [routeData.PART_QUESTIONS, routeData.VEHICLE_PARTS, true],
+            [routeData.VEHICLE_PARTS, routeData.VEHICLE_PARTS, false],
+            [routeData.QUOTE, routeData.VEHICLE_PARTS, false],
+            [routeData.QUOTE, routeData.QUOTE, false],
+            [routeData.VEHICLE_PARTS, routeData.PART_QUESTIONS, false],
+            [routeData.PART_QUESTIONS, routeData.CAPABILITY_QUESTIONS, true],
+            [routeData.MOLDING_QUESTIONS, routeData.CAPABILITY_QUESTIONS, true],
         ];
         test.each(testCases)(
             "%s comes before %s is %s",
@@ -305,7 +305,7 @@ describe("vehicle-questions-mixin", () => {
                 const { wrapper } = setupMocks({});
 
                 // Act
-                const result = wrapper.vm.currentPageComesBeforePage(currentPage, nextPage);
+                const result = wrapper.vm.currentPageComesBeforePage(currentPage.name, nextPage.name);
 
                 // Assert
                 expect(result).toEqual(expectedResult);
@@ -315,20 +315,20 @@ describe("vehicle-questions-mixin", () => {
 
     describe("currentPageComesAfterPage", () => {
         const testCases = [
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.QUOTE, fmgPageValues.VEHICLE_PARTS, true],
-            [fmgPageValues.QUOTE, fmgPageValues.QUOTE, false],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.PART_QUESTIONS, true],
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, false],
-            [fmgPageValues.MOLDING_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, false],
+            [routeData.PART_QUESTIONS, routeData.VEHICLE_PARTS, false],
+            [routeData.VEHICLE_PARTS, routeData.VEHICLE_PARTS, false],
+            [routeData.QUOTE, routeData.VEHICLE_PARTS, true],
+            [routeData.QUOTE, routeData.QUOTE, false],
+            [routeData.VEHICLE_PARTS, routeData.PART_QUESTIONS, true],
+            [routeData.PART_QUESTIONS, routeData.CAPABILITY_QUESTIONS, false],
+            [routeData.MOLDING_QUESTIONS, routeData.CAPABILITY_QUESTIONS, false],
         ];
         test.each(testCases)("%s comes after %s is %s", (currentPage, nextPage, expectedResult) => {
             // Arrange
             const { wrapper } = setupMocks({});
 
             // Act
-            const result = wrapper.vm.currentPageComesAfterPage(currentPage, nextPage);
+            const result = wrapper.vm.currentPageComesAfterPage(currentPage.name, nextPage.name);
 
             // Assert
             expect(result).toEqual(expectedResult);
@@ -1321,12 +1321,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1436,12 +1434,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1543,12 +1539,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1698,12 +1692,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1746,12 +1738,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1858,12 +1848,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2036,12 +2024,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2095,12 +2081,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2137,12 +2121,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2315,7 +2297,7 @@ describe("vehicle-questions-mixin", () => {
 
         test("current page is quote, there are no questions, and we have their vin => go to vin-lookup", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE, hasVin: true });
+            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name, hasVin: true });
 
             // Act
             store.dispatch = jest.fn(() => {});
@@ -2324,13 +2306,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.QUOTE } }
+                routeData.QUOTE.name
             );
         });
 
         test("current page is quote and there are capability questions => go to capability questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE });
+            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name });
             wrapper.vm.hasCapabilityQuestions = jest.fn().mockReturnValue(true);
 
             // Act
@@ -2340,13 +2322,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.QUOTE } }
+                routeData.QUOTE.name
             );
         });
 
         test("current page is quote and there are part questions and molding questions => go to molding questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE });
+            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
 
@@ -2356,13 +2338,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.QUOTE } }
+                routeData.QUOTE.name
             );
         });
 
         test("current page is molding questions and there are part questions, multiple parts to choose, and capability questions => go to vehicle-parts", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.MOLDING_QUESTIONS });
+            const { wrapper } = setupMocks({ fmgPage: routeData.MOLDING_QUESTIONS.name });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasGlassLocationWithMultipleParts = jest.fn().mockReturnValue(true);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
@@ -2375,13 +2357,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                { query: { fmgPage: fmgPageValues.MOLDING_QUESTIONS } }
+                routeData.MOLDING_QUESTIONS.name
             );
         });
 
         test("current page is molding questions and there are part questions and capability questions => go to part-questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.MOLDING_QUESTIONS });
+            const { wrapper } = setupMocks({ fmgPage: routeData.MOLDING_QUESTIONS.name });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasGlassLocationWithMultipleParts = jest.fn().mockReturnValue(false);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
@@ -2394,13 +2376,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.MOLDING_QUESTIONS } }
+                routeData.MOLDING_QUESTIONS.name
             );
         });
     });
 });
 
-function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
+function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
     const baseMixin = setupMocksForJsFiles({
         actionList: [
             {
@@ -2423,6 +2405,7 @@ function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
+            navigateWithPageData: jest.fn(),
         },
         store: {
             commit: jest.fn(),
@@ -2436,9 +2419,7 @@ function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
             },
         },
         route: {
-            query: {
-                fmgPage,
-            },
+            name: fmgPage
         },
     });
 
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index ce9c267f9..d9ff6f874 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -58,6 +58,9 @@ function setupMocks({ partsOrQuestions = [] }) {
                 },
             },
         },
+        route: {
+            name: "vin-lookup",
+        },
     });
 
     const mockVinComponent = {
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 69e2feb66..68c8f6761 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -3,7 +3,7 @@ import { mutations, state, actions, getters } from "@/store";
 import { storeMutations } from "@/constants/store-mutations";
 import { storeActions } from "@/constants/store-actions";
 import { experimentTriggers } from "@/constants/experiments";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 
 // Mock global method
@@ -1862,15 +1862,15 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.VEHICLE_PARTS,
+                    page: routeData.VEHICLE_PARTS.name,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             } else {
@@ -1884,15 +1884,15 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.VEHICLE_PARTS,
+                    page: routeData.VEHICLE_PARTS.name,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             }
@@ -2040,11 +2040,11 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             } else {
@@ -2058,11 +2058,11 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             }
@@ -2085,12 +2085,12 @@ describe("Actions", () => {
             ];
 
             mutations.updatePageData(context, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: previouslySelectedParts,
             });
 
             mutations.updatePageData(context, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: previouslySelectedParts,
             });
 
@@ -2134,7 +2134,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2187,7 +2187,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2232,7 +2232,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2285,7 +2285,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2330,7 +2330,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2383,7 +2383,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2428,7 +2428,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2481,7 +2481,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2522,7 +2522,7 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             } else {
@@ -2532,7 +2532,7 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             }

From ed8aefd67517dd290f915dbf19fa1cb4ac8b5870 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 8 May 2025 16:54:18 -0400
Subject: [PATCH 22/64] prettier

---
 src/helpers/unit-test-helper.js                         | 4 +++-
 src/layouts/estimate/estimate.spec.js                   | 2 +-
 src/layouts/insurance-company/insurance-company.spec.js | 2 +-
 src/layouts/return-user/return-user.vue                 | 7 +------
 src/mixins/vehicle-questions-mixin.spec.js              | 7 +++++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 8f3d04183..9ac3edde9 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -77,7 +77,9 @@ export function getMountOptions(mockData) {
         mixins: mockData.mixins,
         stubs: { Form },
         computed: {
-            pageName() { return mockData?.route?.name },
+            pageName() {
+                return mockData?.route?.name;
+            },
         },
     };
     const props = mockData.propsData || {};
diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 38b4ad41e..5217325f9 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -263,7 +263,7 @@ function setupMocks({
             navigateWithoutSaving: jest.fn(),
         },
         route: {
-            name: "estimate"
+            name: "estimate",
         },
     },
 }) {
diff --git a/src/layouts/insurance-company/insurance-company.spec.js b/src/layouts/insurance-company/insurance-company.spec.js
index 540866d5f..7df1f047a 100644
--- a/src/layouts/insurance-company/insurance-company.spec.js
+++ b/src/layouts/insurance-company/insurance-company.spec.js
@@ -26,7 +26,7 @@ jest.mock("@/mixins/base-mixin.js", () => ({
         return {
             navigationScenarios: {
                 CLICKED_BACK: "clicked_back",
-                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own"
+                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own",
             },
         };
     },
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 91df48150..5b397ea76 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -90,12 +90,7 @@ export default {
         },
 
         async startOver() {
-            this.pushEventToGA(
-                this.pageName,
-                this.GaActions.CLICKED,
-                "Start over",
-                true
-            );
+            this.pushEventToGA(this.pageName, this.GaActions.CLICKED, "Start over", true);
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_RESTART,
                 this.pageName
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 558adadd0..0fd027258 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -305,7 +305,10 @@ describe("vehicle-questions-mixin", () => {
                 const { wrapper } = setupMocks({});
 
                 // Act
-                const result = wrapper.vm.currentPageComesBeforePage(currentPage.name, nextPage.name);
+                const result = wrapper.vm.currentPageComesBeforePage(
+                    currentPage.name,
+                    nextPage.name
+                );
 
                 // Assert
                 expect(result).toEqual(expectedResult);
@@ -2419,7 +2422,7 @@ function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
             },
         },
         route: {
-            name: fmgPage
+            name: fmgPage,
         },
     });
 

From 8bf64643ca6eb0b733408c4349a2fa65994bce96 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Fri, 9 May 2025 10:48:09 -0400
Subject: [PATCH 23/64] CASH-535 - Moved saving the vuex code functionality
 from order helper to quote page for cashPriceSubTotal.

---
 .../heritage-integration/order-helper.js        | 16 ----------------
 src/layouts/quote/quote.vue                     | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 11750108c..76729e49f 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -83,22 +83,6 @@ export async function saveSession({
     if (!store.getters.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
         await saveSessionPromise;
     }
-
-    const lineItems = store.getters.order?.lineItems ?? {};
-    const combinedLineItems = [
-        ...(lineItems.glassParts || []),
-        ...(lineItems.supportingItems || []),
-        ...(lineItems.vaps || []),
-        ...(lineItems.promos || []),
-    ];
-
-    const cashPriceSubtotal = combinedLineItems.length
-        ? baseMixin.methods
-              .getTotalPriceOfAllLineItemsAndChildParts(combinedLineItems, false)
-              .toFixed(2)
-        : "";
-
-    store.commit(storeMutations.UPDATE_CASH_PRICE_SUBTOTAL, cashPriceSubtotal);
 }
 
 export async function submitWorkOrder({
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 57c0178e3..47b3e7375 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -168,6 +168,7 @@ import {
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -766,6 +767,22 @@ export default {
                     this.$route
                 );
             }
+
+            const lineItems = store.getters.order?.lineItems ?? {};
+            const combinedLineItems = [
+                ...(lineItems.glassParts || []),
+                ...(lineItems.supportingItems || []),
+                ...(lineItems.vaps || []),
+                ...(lineItems.promos || []),
+            ];
+
+            const cashPriceSubtotal = combinedLineItems.length
+                ? baseMixin.methods
+                      .getTotalPriceOfAllLineItemsAndChildParts(combinedLineItems, false)
+                      .toFixed(2)
+                : "";
+
+            store.commit(storeMutations.UPDATE_CASH_PRICE_SUBTOTAL, cashPriceSubtotal);
         },
         attachCustomEventsForAnalytics() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {

From ffe4c730440f238426202a4bc956a7bb50df5591 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Sat, 10 May 2025 18:51:34 -0400
Subject: [PATCH 24/64] CASH-535 - Fixed unit test

---
 src/layouts/quote/quote.spec.js | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index fccb49432..f132f6de1 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -12,8 +12,30 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { containsLineItemWithPartType } from "../../helpers/service-package-helper";
 
 jest.mock("@/store", () => ({
-    commit: jest.fn(),
+    commit: jest.fn(), // Mock store.commit
     dispatch: jest.fn(),
+    getters: {
+        order: {
+            lineItems: {
+                glassParts: [],
+                supportingItems: [],
+                vaps: [],
+                promos: [],
+            },
+            payment: {
+                insuranceCoverage: {},
+                isInsurance: false,
+                parentAccountNumber: 167132,
+            },
+        },
+        payment: {
+            insuranceCoverage: {},
+            isInsurance: false,
+        },
+        customer: {
+            emailAddress: "test@test.com",
+        },
+    },
 }));
 
 // Mock fetchCmsContentForPage
@@ -157,6 +179,7 @@ afterEach(() => {
 describe("quote.vue", () => {
     test("IsInsurance false should navigateWithSaving", async () => {
         //Arrange
+        store.commit = jest.fn(); // Ensure store.commit is mocked
         store.getters.payment = {
             insuranceCoverage: {},
             isInsurance: false,
@@ -785,6 +808,7 @@ describe("quote.vue", () => {
     });
     test("On forward button action save promos", async () => {
         //Arrange
+        store.commit = jest.fn(); // Ensure store.commit is mocked
         store.getters.payment = {
             insuranceCoverage: {},
             isInsurance: false,
@@ -809,7 +833,8 @@ describe("quote.vue", () => {
         expect(wrapper.vm.lineItems.promos !== null).toBe(true);
     });
     test("On forward button action save supporting lineItems", async () => {
-        //Arrange
+        // Arrange
+        store.commit = jest.fn(); // Ensure store.commit is mocked
         store.getters.payment = {
             insuranceCoverage: {},
             isInsurance: false,
@@ -820,6 +845,7 @@ describe("quote.vue", () => {
                 parentAccountNumber: 167132,
             },
         };
+
         const { wrapper } = setupMocks({
             customMountOptions: {
                 router: {

From 911a1f0e12d8935bbf1336e4ce56b0ea36e9ed71 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Sun, 11 May 2025 12:08:24 +0530
Subject: [PATCH 25/64] CASH-502

open mobile address when click on mobile option
---
 .../mobile-location-modal-questions.vue       | 41 +++++++++++++++----
 .../service-location/service-location.spec.js |  4 --
 .../service-location/service-location.vue     | 29 +++++--------
 3 files changed, 44 insertions(+), 30 deletions(-)

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 b28fdc7e8..fc83f041a 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
@@ -58,8 +58,9 @@
                     cmsWidgetName="AlertMismatchStateAndZipWidget"
                     alertClass="alert-danger"
                     v-bind:isDismissible="false" />
-            </div>                
-    </div>
+            </div>
+        </div>
+    </transition>
 </template>
 <script>
 // Components
@@ -90,8 +91,7 @@ export default {
         "updated-contains-military-base",
         "updated-bill-to-account-number",
         "setMobileLocation",
-        "set-mobile-location-invalid",        
-        "updated-modal-opened",
+        "set-mobile-location-invalid",
     ],
     data() {
         return {
@@ -208,10 +208,28 @@ export default {
         },
     },
     methods: {
+        isMobileAddressComplete() {
+            return (
+                this.addressModel.streetAddress &&
+                this.addressModel.streetAddress !== "" &&
+                this.addressModel.city &&
+                this.addressModel.city !== "" &&
+                this.addressModel.state &&
+                this.addressModel.state !== "" &&
+                this.addressModel.zipCode &&
+                this.addressModel.zipCode !== "" &&
+                this.internalModel.isVehicleProtected !== null
+            );
+        },
+        getIsMobleLocationOpened() {
+            if (this.isServiceAddressFromStoreAvailable) {
+                return false;
+            }
+            return true;
+        },
         setMobileLocationInvalid(isFormInvalid) {
             this.$emit("set-mobile-location-invalid", isFormInvalid);
-            }
-
+        },
         resetAlerts() {
             this.displayInvalidZipAlert = false;
             this.displayMismatchStateAndZipAlert = false;
@@ -282,12 +300,19 @@ export default {
     },
     watch: {
         internalModel: {
-            handler(newValue) {
-                this.handleChange(newValue);
+            handler() {
                 this.setMobileLocation();
             },
             deep: true,
         },
+
+        modelValue: {
+            handler(newValue) {
+                this.internalModel = deepClone(newValue);
+                this.handleChange(newValue);
+            },
+            deep: true,
+        },
     },
     components: {
         addressQuestions,
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 6b108abb0..24030fb1f 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -343,7 +343,6 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                isMobileSelectedAndModalClosed: true,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -356,7 +355,6 @@ describe("service-location.vue", () => {
                     zipCode: "61606",
                 },
                 isVehicleProtected: null,
-                isMobileSelectedAndModalClosed: false,
             };
 
             // Act
@@ -459,7 +457,6 @@ describe("service-location.vue", () => {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                isMobileSelectedAndModalClosed: false,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
             const newMobileLocationQuestions = {
@@ -471,7 +468,6 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                isMobileSelectedAndModalClosed: true,
             };
 
             //wrapper.vm.closeModalAction = jest.fn();
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 0f435e4af..17ee9aac3 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -100,7 +100,6 @@
                         @updated-serviceability="setServiceabilityDetails"
                         @updated-contains-military-base="setContainsMilitaryBase"
                         @updated-mobile-ctu="setCtuForMobile"
-                        @updated-modal-opened="setMobileLocationModalOpened"
                         validationRules="mobile-location-required"
                         ref="mobileLocationQuestions"
                         linkWidgetName="MobileLocationLinkWidget"
@@ -123,7 +122,7 @@
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
-                        :isForwardActionDisabled="!meta.valid || isForwardActionDisabled || mobileLocationModalOpened"
+                        :isForwardActionDisabled="!meta.valid || isForwardActionDisabled"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -177,12 +176,11 @@ const MOBILE_FEE_PART_TYPE = "MOBILE FEE";
 // DEFINE VALIDATION RULES
 defineRule("mobile-location-required", (value) => {
     if (
-        value.isMobileSelectedAndModalClosed &&
-        (!value.addressQuestions.streetAddress ||
-            !value.addressQuestions.city ||
-            !value.addressQuestions.state ||
-            !value.addressQuestions.zipCode ||
-            !value.isVehicleProtected)
+        !value.addressQuestions.streetAddress ||
+        !value.addressQuestions.city ||
+        !value.addressQuestions.state ||
+        !value.addressQuestions.zipCode ||
+        !value.isVehicleProtected
     ) {
         return errorMessages.MOBILE_LOCATION_REQUIRED;
     }
@@ -217,7 +215,6 @@ export default {
             shopProviderData: null,
             navigatingForward: false,
             isMobileAddressValid: true,
-            mobileLocationModalOpened: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -308,9 +305,6 @@ export default {
                         zipCode: this.zipCode,
                     },
                     isVehicleProtected: this.isVehicleProtected,
-                    isMobileSelectedAndModalClosed:
-                        this.selectedAppointmentType === "Mobile" &&
-                        !this.mobileLocationModalOpened,
                 };
             },
         },
@@ -514,9 +508,6 @@ export default {
         setRecycleFeePart(recycleFeePart) {
             this.recycleFeePart = recycleFeePart;
         },
-        setMobileLocationModalOpened(isModalOpened) {
-            this.mobileLocationModalOpened = isModalOpened;
-        },
         //creating async function as the computed property can not directly handle asynchronous operations or promises.
         async setMobileLocationQuestions(newValue) {
             var newZipCode = newValue.addressQuestions.zipCode;
@@ -784,9 +775,11 @@ export default {
                     this.selectedProvider = new Provider(
                         this.shopProviderData.mobileProviderNumber
                     );
-                    var mobileLocationQs = this.$refs.mobileLocationQuestions;
-                    if (!mobileLocationQs.isMobileAddressComplete()) {
-                        mobileLocationQs.openModal();
+                    var mobileLocationQuestionsRef = this.$refs.mobileLocationQuestions;
+                    var isMobileAddressComplete =
+                        mobileLocationQuestionsRef.isMobileAddressComplete;
+                    if (isMobileAddressComplete) {
+                        mobileLocationQuestionsRef.isMobileLocationOpened = true;
                     }
                 } else {
                     this.selectedProvider = new Provider();

From 0ea4ef5e1d5c39958d0a7b7f2d100006099fc866 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Mon, 12 May 2025 15:24:03 -0400
Subject: [PATCH 26/64] CASH-633: Show afterpay banner for insurance tab if
 afterpay breakout

---
 .../quote/afterpay-modal-banner/afterpay-modal-banner.vue | 8 ++++++--
 src/layouts/quote/quote.vue                               | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
index 3b682e52b..3081cdc7d 100644
--- a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
+++ b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
@@ -53,6 +53,7 @@ export default {
         cmsWidgetName: String,
         lineItems: Array,
         isAfterpayBreakoutDisplay: Boolean,
+        isInsuranceSelected: Boolean,
     },
     data() {
         return {};
@@ -72,9 +73,12 @@ export default {
         afterpayCopyTokens() {
             if (this.isAfterpayBreakoutDisplay) {
                 // Text for Afterpay Breakout experiment
-                return splitCopyOnCMSPlaceHolder(
-                    this.getCmsContent(this.cmsWidgetName, "BodyText2")
+                var afterpayBannerCopy = this.getCmsContent(this.cmsWidgetName, "BodyText2");
+                afterpayBannerCopy = afterpayBannerCopy && afterpayBannerCopy.replaceAll(
+                    "{custom:paymentType}",
+                    this.isInsuranceSelected ? "deductible" : "spending"
                 );
+                return splitCopyOnCMSPlaceHolder(afterpayBannerCopy);
             } else {
                 return splitCopyOnCMSPlaceHolder(
                     this.getCmsContent(this.cmsWidgetName, "HeaderText")
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 4a20b4dbc..ea83d10b6 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -47,6 +47,7 @@
                         v-if="showAfterpayBanner"
                         cmsWidgetName="AfterpayModalWidget"
                         :isAfterpayBreakoutDisplay="isAfterpayBreakoutDisplay"
+                        :isInsuranceSelected="isInsuranceSelected"
                         :lineItems="lineItems" />
 
                     <!-- If vehicle requires recal AND we are hiding recal pricing info, then show recal disclaimer banner. -->
@@ -588,7 +589,7 @@ export default {
         },
         showAfterpayBanner() {
             return (
-                !this.isInsuranceSelected &&
+                (this.isAfterpayBreakoutDisplay || !this.isInsuranceSelected) &&
                 (!this.isRecalibrationOnOrder || !this.shouldHideRecalibration)
             );
         },

From 57c047a464c0fce221cc8cdeebb9134d0f3454d4 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Mon, 12 May 2025 15:35:31 -0400
Subject: [PATCH 27/64] CASH-633: Prettier

---
 .../afterpay-modal-banner/afterpay-modal-banner.vue    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
index 3081cdc7d..c40e518df 100644
--- a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
+++ b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
@@ -74,10 +74,12 @@ export default {
             if (this.isAfterpayBreakoutDisplay) {
                 // Text for Afterpay Breakout experiment
                 var afterpayBannerCopy = this.getCmsContent(this.cmsWidgetName, "BodyText2");
-                afterpayBannerCopy = afterpayBannerCopy && afterpayBannerCopy.replaceAll(
-                    "{custom:paymentType}",
-                    this.isInsuranceSelected ? "deductible" : "spending"
-                );
+                afterpayBannerCopy =
+                    afterpayBannerCopy &&
+                    afterpayBannerCopy.replaceAll(
+                        "{custom:paymentType}",
+                        this.isInsuranceSelected ? "deductible" : "spending"
+                    );
                 return splitCopyOnCMSPlaceHolder(afterpayBannerCopy);
             } else {
                 return splitCopyOnCMSPlaceHolder(

From f0fa576ba2085f89219a0ec12f2bc0ceb7a09e02 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 12 May 2025 16:29:15 -0400
Subject: [PATCH 28/64] Update logging for new router.

---
 src/helpers/debug-log-helper.js               | 23 ++++++
 .../heritage-integration/navigation-helper.js | 12 ++-
 src/layouts/payment-method/payment-method.vue | 40 +++++-----
 src/layouts/payment/payment.vue               | 80 +++++++++++--------
 src/layouts/quote/quote.vue                   | 46 ++++-------
 src/layouts/schedule/schedule.vue             | 22 +++--
 src/layouts/vehicle/vehicle.vue               | 14 ++--
 src/mixins/base-mixin.js                      |  7 +-
 src/router/methods/before-each.js             |  4 +
 9 files changed, 132 insertions(+), 116 deletions(-)
 create mode 100644 src/helpers/debug-log-helper.js

diff --git a/src/helpers/debug-log-helper.js b/src/helpers/debug-log-helper.js
new file mode 100644
index 000000000..ea0ac3337
--- /dev/null
+++ b/src/helpers/debug-log-helper.js
@@ -0,0 +1,23 @@
+import store from "@/store";
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { queryStrings } from "@/constants/query-strings";
+import { storeActions } from "@/constants/store-actions";
+
+export function debugLog(message, data, forceLog = false) {
+    checkLogParam();
+
+    if (store?.getters?.applicationUser?.loggingOption || forceLog) {
+        data = data ?? "";
+        const outData = typeof data === "object" ? JSON.stringify(data) : data;
+
+        console.log(`${new Date()} ${message} ${outData}`);
+    }
+}
+
+export function checkLogParam() {
+    const logQueryString = getQuerystringParameter(queryStrings.LOG);
+
+    if (logQueryString) {
+        store?.dispatch(storeActions?.SAVE_LOGGING_OPTION, logQueryString);
+    }
+}
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index ca547b980..90f9593b9 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -8,18 +8,16 @@ import { includesWindshieldReplacement } from "@/helpers/damage-helper";
 import { applicationConfig } from "@/constants/application-config.js";
 import store from "@/store";
 import router from "@/router";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 /*
     Used to navigate to the heritage funnel with the correct query string and url.
 */
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
-    const log = getQuerystringParameter(queryStrings.LOG);
-    if (log === "true") {
-        console.log("------------- Navigate to heritage start -----------------");
-        console.log(new Date() + " applicationConfig: " + JSON.stringify(applicationConfig));
-        console.log(new Date() + " navigateToHeritageFunnel: " + applicationConfig.HERITAGE_FUNNEL);
-        console.log("------------- Navigate to heritage end -----------------");
-    }
+    debugLog("--- Navigate to heritage start ---");
+    debugLog("applicationConfig:", applicationConfig);
+    debugLog("navigateToHeritageFunnel:", applicationConfig.HERITAGE_FUNNEL);
+    debugLog("--- Navigate to heritage end ---");
 
     // Create the order (or save existing order) when navigating to Heritage Funnel.
     if (shouldSaveSession) {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index e2debfe4a..e0de7fc0f 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,6 +168,7 @@ import {
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
 import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -440,26 +441,25 @@ export default {
 
             // prettier-ignore
             {
-                const log = getQuerystringParameter(queryStrings.LOG);
-                const logAsBool = getBoolFromString(log);
-                if (logAsBool || !preReqResult) {
-                    console.log("------------- payment-method.vue pagePrereqs start -----------------");
-                    console.log(new Date() + " serviceLocationReqs::isMobile: " + isMobile);
-                    console.log(new Date() + " serviceLocationReqs::mobileReqs: " + mobileReqs);
-                    console.log(new Date() + " serviceLocationReqs::dropOffInshopReqs: " + dropOffInshopReqs);
-                    console.log(new Date() + " serviceLocationReqs:: result " + serviceLocationReqs);
-                    console.log(new Date() + " isInsuranceSet:: " + isInsuranceSet());
-                    console.log(new Date() + " scheduleReqs::schedule.date:" + schedule.date);
-                    console.log(new Date() + " scheduleReqs::schedule.startTime:" + schedule.startTime);
-                    console.log(new Date() + " scheduleReqs::schedule.endTime:" + schedule.endTime);
-                    console.log(new Date() + " scheduleReqs::schedule.jobMaxMinutes:" + schedule.jobMaxMinutes);
-                    console.log(new Date() + " scheduleReqs::schedule.jobMinMinutes:" + schedule.jobMinMinutes);
-                    console.log(new Date() + " customerReqs::customer.firstName:" + customer.firstName);
-                    console.log(new Date() + " customerReqs::customer.lastName:" + customer.lastName);
-                    console.log(new Date() + " customerReqs::customer.phoneNumber:" + customer.phoneNumber);
-                    console.log(new Date() + " customerReqs::customer.emailAddress:" + customer.emailAddress);
-                    console.log("------------- payment-method.vue pagePrereqs end -----------------");
-                }
+                debugLog("--- payment-method.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("serviceLocationRequs::isMobile:", isMobile, !preReqResult);
+                debugLog("serviceLocationReqs::mobileReqs:", mobileReqs, !preReqResult);
+                debugLog("serviceLocationReqs::dropOffInshopReqs:", dropOffInshopReqs, !preReqResult);
+                debugLog("serviceLocationReqs:: result", serviceLocationReqs, !preReqResult);
+
+                debugLog("isInsuranceSet::", isInsuranceSet(), !preReqResult);
+
+                debugLog("scheduleReqs::schedule.date:", schedule.date, !preReqResult);
+                debugLog("scheduleReqs::schedule.startTime:", schedule.startTime, !preReqResult);
+                debugLog("scheduleReqs::schedule.endTime:", schedule.endTime, !preReqResult);
+                debugLog("scheduleReqs::schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
+                debugLog("scheduleReqs::schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
+
+                debugLog("customerReqs::customer.firstName:", customer.firstName, !preReqResult);
+                debugLog("customerReqs::customer.lastName:", customer.lastName, !preReqResult);
+                debugLog("customerReqs::customer.phoneNumber:", customer.phoneNumber, !preReqResult);
+                debugLog("customerReqs::customer.emailAddress:", customer.emailAddress, !preReqResult);
+                debugLog("--- payment-method.vue pagePrereqs end ---", null, !preReqResult);
             }
 
             return preReqResult;
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 40d772dbb..745d5ebe1 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -238,6 +238,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
+import { debugLog } from "@/helpers/debug-log-helper.js";
 
 export default {
     name: "payment",
@@ -545,41 +546,50 @@ export default {
 
             // prettier-ignore
             {
-                if (store.getters.applicationUser.loggingOption || !preReqResult) {
-                    console.log("------------- payment.vue pagePrereqs start -----------------");
-                    console.log(new Date() +  "mobileReqs:" + mobileReqs);
-                    console.log(new Date() +  "serviceLocation.address:" + serviceLocation.address);
-                    console.log(new Date() +  "serviceLocation.city:" + serviceLocation.city);
-                    console.log(new Date() +  "serviceLocation.state:" + serviceLocation.state);
-                    console.log(new Date() +  "serviceLocation.zipCode:" + serviceLocation.zipCode);
-                    console.log("");
-                    console.log(new Date() +  "dropOffInshopReqs:" + dropOffInshopReqs);
-                    console.log(new Date() +  "serviceLocationReqs:" + serviceLocationReqs);
-                    console.log(new Date() +  "providerLocation.streetAddress:" + providerLocation.streetAddress);
-                    console.log(new Date() +  "providerLocation.city:" + providerLocation.city);
-                    console.log(new Date() +  "providerLocation.state:" + providerLocation.state);
-                    console.log(new Date() +  "providerLocation.zipCode:" + providerLocation.zipCode);
-                    console.log("");
-                    console.log(new Date() +  "isInsuranceSet:" + isInsuranceSet);
-                    console.log("");
-                    console.log(new Date() +  "scheduleReqs:" + scheduleReqs);
-                    console.log(new Date() +  "schedule.date:" + schedule.date);
-                    console.log(new Date() +  "schedule.startTime:" + schedule.startTime);
-                    console.log(new Date() +  "schedule.endTime:" + schedule.endTime);
-                    console.log(new Date() +  "schedule.jobMaxMinutes:" + schedule.jobMaxMinutes);
-                    console.log(new Date() +  "schedule.jobMinMinutes:" + schedule.jobMinMinutes);
-                    console.log("");
-                    console.log(new Date() +  "customerReqs:" + customerReqs);
-                    console.log(new Date() +  "customer.firstName:" + customer.firstName);
-                    console.log(new Date() +  "customer.lastName:" + customer.lastName);
-                    console.log(new Date() +  "customer.phoneNumber:" + customer.phoneNumber);
-                    console.log(new Date() +  "customer.emailAddress:" + customer.emailAddress);
-                    console.log("");
-                    console.log(new Date() +  "paymentMethodReqs:" + paymentMethodReqs);
-                    console.log(new Date() +  "store.getters.order.payment.isPia:" + store.getters.order.payment.isPia);
-                    console.log(new Date() +  "store.getters.order.payment.piaType:" + store.getters.order.payment.piaType);
-                    console.log("------------- payment.vue pagePrereqs end -------------------");
-                }
+                debugLog("--- payment.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("mobileReqs:", mobileReqs, !preReqResult);
+                debugLog("serviceLocation.address:", serviceLocation.address, !preReqResult);
+                debugLog("serviceLocation.city:", serviceLocation.city, !preReqResult);
+                debugLog("serviceLocation.state:", serviceLocation.state, !preReqResult);
+                debugLog("serviceLocation.zipCode:", serviceLocation.zipCode, !preReqResult);
+
+                debugLog("", null, !preReqResult);
+
+                debugLog("dropOffInshopReqs:", dropOffInshopReqs, !preReqResult);
+                debugLog("serviceLocationReqs:", serviceLocationReqs, !preReqResult);
+                debugLog("providerLocation.streetAddress:", providerLocation.streetAddress, !preReqResult);
+                debugLog("providerLocation.city:", providerLocation.city, !preReqResult);
+                debugLog("providerLocation.state:", providerLocation.state, !preReqResult);
+                debugLog("providerLocation.zipCode:", providerLocation.zipCode, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+                
+                debugLog("isInsuranceSet:", isInsuranceSet, !preReqResult);
+
+                debugLog("", null, !preReqResult);
+
+                debugLog("scheduleReqs:", scheduleReqs, !preReqResult);
+                debugLog("schedule.date:", schedule.date, !preReqResult);
+                debugLog("schedule.startTime:", schedule.startTime, !preReqResult);
+                debugLog("schedule.endTime:", schedule.endTime, !preReqResult);
+                debugLog("schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
+                debugLog("schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+
+                debugLog("customerReqs:", customerReqs, !preReqResult);
+                debugLog("customer.firstName:", customer.firstName, !preReqResult);
+                debugLog("customer.lastName:", customer.lastName, !preReqResult);
+                debugLog("customer.phoneNumber:", customer.phoneNumber, !preReqResult);
+                debugLog("customer.emailAddress:", customer.emailAddress, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+
+                debugLog("paymentMethodReqs:", paymentMethodReqs, !preReqResult);
+                debugLog("store.getters.order.payment.isPia:", store.getters.order?.payment?.isPia, !preReqResult);
+                debugLog("store.getters.order.payment.piaType:", store.getters.order?.payment?.piaType, !preReqResult);
+
+                debugLog("--- payment.vue pagePrereqs end ---", null, !preReqResult);
             }
 
             return preReqResult;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index e15e8b8c3..21df2a59a 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -170,6 +170,7 @@ import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { routeData } from "@/router/constants/routes";
 import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -461,9 +462,7 @@ export default {
                         baseMixin.methods.getTierOnePackagePrice(lineItemsNoDiscount);
                     // prettier-ignore
                     {
-                        if (store.getters.applicationUser.loggingOption) {
-                            console.log(new Date() + " quote tierOnePrice comparison: " + tierOnePrice + " > " + insuranceThreshold + "=" + (tierOnePrice > insuranceThreshold));
-                        }
+                        debugLog("quote tierOnePrice comparison: " + tierOnePrice + " > " + insuranceThreshold + "=" + (tierOnePrice > insuranceThreshold));
                     }
 
                     // compare base price vs arbitrary threshold (representing insurance price)
@@ -484,21 +483,17 @@ export default {
 
             // prettier-ignore
             {
-                if (store.getters.applicationUser.loggingOption) {
-                    console.log("------------- quote.vue thresholds start -----------------");
-                    console.log(new Date() + " isExternalParameter: " + isExternalParameter);
-                    console.log(new Date() + " internalThreshold: " + internalThreshold);
-                    console.log(new Date() + " externalThreshold: " + externalThreshold);
-                    console.log("------------- quote.vue thresholds end -----------------");
-                }
+                debugLog("--- quote.vue thresholds start ---");
+                debugLog(" isExternalParameter: ", isExternalParameter);
+                debugLog(" internalThreshold: ", internalThreshold);
+                debugLog(" externalThreshold: ", externalThreshold);
+                debugLog("--- quote.vue thresholds end ---");
             }
 
             if (isExternalParameter === externalParameterStatus.NOT_SET) {
                 // prettier-ignore
                 {
-                    if (store.getters.applicationUser.loggingOption) {
-                        console.log(new Date() + "quote.vue tab select EXTERNAL not set");
-                    }
+                    debugLog("quote.vue tab select EXTERNAL not set");
                 }
                 // there are no active or inactive external parameters; use internal threshold
                 if (internalThreshold) thresholdToUse = internalThreshold;
@@ -513,9 +508,7 @@ export default {
                 if (getBoolFromString(store.getters.externalParameterQuote?.isInsurance)) {
                     // prettier-ignore
                     {
-                        if (store.getters.applicationUser.loggingOption) {
-                            console.log(new Date() + "quote.vue tab select EXTERNAL ISINSURANCE");
-                        }
+                        debugLog("quote.vue tab select EXTERNAL ISINSURANCE");
                     }
 
                     const insuranceSelection = true;
@@ -534,9 +527,7 @@ export default {
 
                     // prettier-ignore
                     {
-                        if (store.getters.applicationUser.loggingOption) {
-                            console.log(new Date() + "quote.vue tab select NOT EXTERNAL");
-                        }
+                        debugLog("quote.vue tab select NOT EXTERNAL");
                     }
 
                     vm.isInsuranceSelected = getIsInsuranceSelectedValue(
@@ -652,16 +643,13 @@ export default {
 
             // prettier-ignore
             {
-                const log = getQuerystringParameter(queryStrings.LOG);
-                if (log === "true" || !preReqResult) {
-                    console.log("------------- quote.vue pagePrereqs start -----------------");
-                    console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + store.getters.order.serviceLocation?.zipCode);
-                    console.log(new Date() +" store.getters.order.serviceLocation.zipCodeCtu: " + store.getters.order.serviceLocation?.zipCodeCtu);
-                    console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage?.isRepair);
-                    console.log(new Date() + " store.getters.order.lineItems?.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts));
-                    console.log(new Date() + " store.getters.order.payment.insuranceCoverage?.isVerified: " + payment?.insuranceCoverage?.isVerified);
-                    console.log("------------- quote.vue pagePrereqs end -----------------");
-                }
+                debugLog("--- quote.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCode:", store.getters.order.serviceLocation?.zipCode, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCodeCtu:", store.getters.order.serviceLocation?.zipCodeCtu, !preReqResult);
+                debugLog("store.getters.order.damage.isRepair:", store.getters.order.damage?.isRepair, !preReqResult);
+                debugLog("store.getters.order.lineItems?.glassParts:", store.getters.order.lineItems?.glassParts, !preReqResult);
+                debugLog("store.getters.order.payemt.insuranceCoverage?.isVerified:", store.getters.order.payment?.insuranceCoverage?.isVerified, !preReqResult);
+                debugLog("--- quote.vue pagePrereqs end ---", null, !preReqResult);
             }
 
             return preReqResult;
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b47de1fa8..b752a5d22 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -94,6 +94,7 @@ import { getAmountDue, getPricingByDayPartWithPrice } from "@/helpers/pricing-he
 import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
 import { partNumberStrings } from "@/constants/part-number-strings";
 import { deepClone } from "@/helpers/object-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("date-required", required(errorMessages.DATE_REQUIRED));
@@ -428,18 +429,15 @@ export default {
 
             // prettier-ignore
             {
-                const log = getQuerystringParameter(queryStrings.LOG);
-                if (log === "true" || !preReqResult) {
-                    console.log("------------- schedule.vue pagePrereqs start -----------------");
-                    console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + serviceLocation.zipCode);
-                    console.log(new Date() + " store.getters.order.serviceLocation.zipCodeCtu: " + serviceLocation.zipCodeCtu);
-                    console.log(new Date() + " store.getters.order.serviceLocation.appointmentType: " + serviceLocation.appointmentType);
-                    console.log(new Date() + " store.getters.order.serviceLocation.provider.providerNumber: " + serviceLocation.provider.providerNumber);
-                    console.log(new Date() + " store.getters.payment.isInsurance: " + store.getters.payment?.isInsurance);
-                    console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage.isRepair);
-                    console.log(new Date() + " store.getters.order.lineItems.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts));
-                    console.log("------------- schedule.vue pagePrereqs end -------------------");
-                }
+                debugLog("--- schedule.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCode:", serviceLocation.zipCode, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCodeCtu:", serviceLocation.zipCodeCtu, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.appointmentType:", serviceLocation.appointmentType, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.provider.providerNumber:", serviceLocation.provider?.providerNumber, !preReqResult);
+                debugLog("store.getters.payment.isInsurance:", store.getters.payment?.isInsurance, !preReqResult);
+                debugLog("store.getters.order.damage.isRepair:", store.getters.order.damage?.isRepair, !preReqResult);
+                debugLog("store.getters.order.lineItems.glassParts:", store.getters.order.lineItems?.glassParts, !preReqResult);
+                debugLog("--- schedule.vue pagePrereqs end ---", null, !preReqResult);
             }
             return preReqResult;
         },
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 174c76530..131073f90 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -114,6 +114,7 @@ import {
     consumeQueryFromStash,
     peekQueryFromStash,
 } from "@/router/methods/helpers/querystring-stash";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
@@ -148,15 +149,10 @@ export default {
     },
 
     async beforeRouteEnter(to, from, next) {
-        if (store.getters.applicationUser.loggingOption) {
-            console.log(
-                new Date() + "------------- vehicle.vue applicationConfig start -------------"
-            );
-            console.log(new Date() + JSON.stringify(applicationConfig));
-            console.log(
-                new Date() + "------------- vehicle.vue applicationConfig end -------------"
-            );
-        }
+        debugLog("------------- vehicle.vue applicationConfig start -------------");
+        debugLog("", applicationConfig);
+        debugLog("------------- vehicle.vue applicationConfig end -------------");
+
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.name);
         const experimentForLogging = store.getters.applicationUser.experiments.find(
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 3dfca7dbf..ecce2632d 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -9,6 +9,7 @@ import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export default {
     data() {
@@ -95,10 +96,8 @@ export default {
             let totalPrice = this.getTotalPriceOfAllLineItemsAndChildParts(lineItemsToPrice, false);
             // prettier-ignore
             {
-                if (store.getters.applicationUser.loggingOption) {
-                    console.log(new Date() + " base-mixin getTierOnePackagePrice lineItemsToPrice: " + JSON.stringify(lineItemsToPrice));
-                    console.log(new Date() + " base-mixin getTierOnePackagePrice totalPrice: " + totalPrice);
-                }
+                debugLog("base-mixin getTierOnePackagePrice lineItemsToPrice:", lineItemsToPrice);
+                debugLog("base-mixin getTierOnePackagePrice totalPrice:", totalPrice);
             }
             return totalPrice;
         },
diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index dae53b583..aa4e3a9e4 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -13,6 +13,7 @@ import { runExperiments } from "@/router/methods/helpers/run-experiments";
 
 import { bailout } from "@/router/methods/error";
 import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
+import { checkLogParam } from "@/helpers/debug-log-helper";
 
 export async function beforeEach(to, from) {
     try {
@@ -53,6 +54,9 @@ export async function beforeEach(to, from) {
             await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
         }
 
+        // Update if logging is enabled.
+        checkLogParam();
+
         // Ensure page-prerequisites are fulfilled
         const arePagePrerequisitesValid = await checkPagePrerequisites(to.name);
 

From 7a9ac690e565f3212bb7d7d04660c8a1520a7917 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Tue, 13 May 2025 11:56:30 +0530
Subject: [PATCH 29/64] CASH-502

show mobile location question on mobile service selected
---
 .../service-location/service-location.vue     | 31 +++++++++++--------
 .../shop-question/shop-question.vue           |  1 -
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 07f33809d..752d0c4c9 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -114,8 +114,7 @@
                         :selectedAppointmentType="selectedAppointmentType"
                         :shopProviderData="shopProviderData"
                         :isDisplayed="isShopQuestionDisplayed"
-                        cmsWidgetName="ShopQuestionWidget"
-                        :isInshopOnly="isInshopOnly" />
+                        cmsWidgetName="ShopQuestionWidget" />
 
                     <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
 
@@ -176,11 +175,12 @@ const MOBILE_FEE_PART_TYPE = "MOBILE FEE";
 // DEFINE VALIDATION RULES
 defineRule("mobile-location-required", (value) => {
     if (
-        !value.addressQuestions.streetAddress ||
-        !value.addressQuestions.city ||
-        !value.addressQuestions.state ||
-        !value.addressQuestions.zipCode ||
-        !value.isVehicleProtected
+        (!value.addressQuestions.streetAddress ||
+            !value.addressQuestions.city ||
+            !value.addressQuestions.state ||
+            !value.addressQuestions.zipCode ||
+            !value.isVehicleProtected) &&
+        value.isMobileSelected
     ) {
         return errorMessages.MOBILE_LOCATION_REQUIRED;
     }
@@ -754,6 +754,13 @@ export default {
         setMobileLocationInValid(isMobileLocationInValid) {
             this.isMobileAddressValid = !isMobileLocationInValid;
         },
+        displayMobileAddressQuestion(openMobileLocation) {
+            var mobileLocationQuestionsRef = this.$refs.mobileLocationQuestions;
+            var isMobileAddressComplete = mobileLocationQuestionsRef.isMobileAddressComplete;
+            if (isMobileAddressComplete) {
+                mobileLocationQuestionsRef.isMobileLocationOpened = openMobileLocation;
+            }
+        },
     },
     watch: {
         zipCode: {
@@ -765,8 +772,10 @@ export default {
                             this.selectedProvider = new Provider(
                                 this.shopProviderData.mobileProviderNumber
                             );
+                            this.displayMobileAddressQuestion(true);
                         } else {
                             this.selectedProvider = new Provider();
+                            this.displayMobileAddressQuestion(false);
                         }
                     });
                 }
@@ -778,14 +787,10 @@ export default {
                     this.selectedProvider = new Provider(
                         this.shopProviderData.mobileProviderNumber
                     );
-                    var mobileLocationQuestionsRef = this.$refs.mobileLocationQuestions;
-                    var isMobileAddressComplete =
-                        mobileLocationQuestionsRef.isMobileAddressComplete;
-                    if (isMobileAddressComplete) {
-                        mobileLocationQuestionsRef.isMobileLocationOpened = true;
-                    }
+                    this.displayMobileAddressQuestion(true);
                 } else {
                     this.selectedProvider = new Provider();
+                    this.displayMobileAddressQuestion(false);
                 }
             },
         },
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue
index 5e85b752b..72862440b 100644
--- a/src/layouts/service-location/shop-question/shop-question.vue
+++ b/src/layouts/service-location/shop-question/shop-question.vue
@@ -77,7 +77,6 @@ export default {
         cmsWidgetName: String,
         validationRules: String,
         isDisplayed: Boolean,
-        isInshopOnly: Boolean,
     },
     computed: {
         questionText() {

From dfdc79c4aec351ee1ec9929477b8e5be7d585acc Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Tue, 13 May 2025 12:27:37 +0530
Subject: [PATCH 30/64] CASH-502

undo accidental changes
---
 src/layouts/vin-lookup/vin-lookup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 54ac5928e..05f6fdbd7 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -354,7 +354,7 @@ export default {
                     false
                 );
                 if (this.isHeavyTruck) {
-                    var closestShops = await this.findClosestApplicableShops(
+                    const closestShops = await this.findClosestApplicableShops(
                         this.serviceZipCode,
                         this.carId
                     );

From 4d481bfd775677123ea52d499975dd3a1e73eb66 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 10:49:41 -0400
Subject: [PATCH 31/64] Only save session on nav if email or phone number is
 present

---
 src/router/methods/navigate.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/router/methods/navigate.js b/src/router/methods/navigate.js
index 7df947560..b15c955e9 100644
--- a/src/router/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -3,6 +3,7 @@ import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
 import { getDestination } from "@/router/methods/helpers/get-destination";
 import { savePageData } from "@/router/methods/helpers/save-page-data";
 import router from "@/router";
+import store from "@/store";
 
 import { bailout } from "@/router/methods/error";
 
@@ -34,7 +35,12 @@ async function navigate(scenario, currentPageName, withSaving = false, forceTopL
     }
 
     if (withSaving) {
-        await saveSession({ pageNameToLog: nextPage.name });
+        if (
+            store.getters?.applicationUser?.savedSessionId ||
+            store.getters?.order?.customer?.emailAddress
+        ) {
+            await saveSession({ pageNameToLog: nextPage.name });
+        }
     }
 
     // Some pages require manually setting the next url

From 910fe50702e52855f61ef7894512a6e3e9062c06 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 13 May 2025 10:55:53 -0400
Subject: [PATCH 32/64] debug return from heritage

debug return from heritage
---
 src/router/methods/before-each.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index aa4e3a9e4..734385700 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -14,11 +14,18 @@ import { runExperiments } from "@/router/methods/helpers/run-experiments";
 import { bailout } from "@/router/methods/error";
 import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 import { checkLogParam } from "@/helpers/debug-log-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export async function beforeEach(to, from) {
     try {
         await analyticsMixin.methods.validateSession();
 
+        // prettier-ignore
+        {
+            debugLog(`--- before-each.js ${from?.name} start ---`);
+            debugLog(" funnel cookie init: ", getFunnelCookie());
+        }
+
         if (getFunnelCookie()?.SuppressConceptFunnel) {
             // Redirect to heritage.
             return {
@@ -48,6 +55,12 @@ export async function beforeEach(to, from) {
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
+        // prettier-ignore
+        {
+            debugLog(`--- before-each.js ${from?.name} start ---`);
+            debugLog(" funnel cookie after: ", getFunnelCookie());
+        }
+
         // If sent from heritage, need to load session.
         const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
         if (fromHeritageFlag) {
@@ -72,6 +85,12 @@ export async function beforeEach(to, from) {
         }
 
         await runExperiments(to.name);
+
+        // prettier-ignore
+        {
+            debugLog("--- before-each.js end ---");
+        }
+
     } catch (error) {
         const errorPayload = {
             cause: "Uncaught exception in `beforeEach`.",

From 0b7e4f578b8b11499cf8b498432139c456a81879 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 13 May 2025 10:57:55 -0400
Subject: [PATCH 33/64] prettier

---
 src/router/methods/before-each.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 734385700..84514f6c2 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -90,7 +90,6 @@ export async function beforeEach(to, from) {
         {
             debugLog("--- before-each.js end ---");
         }
-
     } catch (error) {
         const errorPayload = {
             cause: "Uncaught exception in `beforeEach`.",

From 5f7840057a9c1ff8451ee31e47078ea298e4cae3 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 11:50:30 -0400
Subject: [PATCH 34/64] Progress bar cleanup

---
 .../funnel-header/progress-bar/progres-bar.spec.js |  8 ++++----
 .../funnel-header/progress-bar/progress-bar.vue    | 14 +++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
index a8d22cc2c..9970b266c 100644
--- a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
+++ b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
@@ -15,7 +15,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(0);
+        expect(wrapper.vm.progress).toBe(0);
         wrapper.unmount();
     });
 });
@@ -33,7 +33,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(4);
+        expect(wrapper.vm.progress).toBe(4);
         wrapper.unmount();
     });
 });
@@ -51,7 +51,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(48);
+        expect(wrapper.vm.progress).toBe(48);
         wrapper.unmount();
     });
 });
@@ -69,7 +69,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(100);
+        expect(wrapper.vm.progress).toBe(100);
         wrapper.unmount();
     });
 });
diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index da370e415..c25476338 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -10,15 +10,11 @@ import { getProgressBarPercentage } from "@/constants/progress-bar-mapper";
 
 export default {
     name: "progressBar",
-    data() {
-        return {
-            progress: this.getProgress(),
-        };
-    },
-    methods: {
-        getProgress() {
-            var pageName = this.pageName;
-            return getProgressBarPercentage(pageName);
+    data() {},
+    computed: {
+        progress() {
+            console.log(`Progress: ${this.pageName} - ${getProgressBarPercentage(this.pageName)}`);
+            return getProgressBarPercentage(this.pageName);
         },
     },
 };

From c48f16bb992422bb82093d98379e86f1251cc386 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 11:53:57 -0400
Subject: [PATCH 35/64] Remove console log

---
 src/fmg-components/funnel-header/progress-bar/progress-bar.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index c25476338..ebce6e0de 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -13,7 +13,6 @@ export default {
     data() {},
     computed: {
         progress() {
-            console.log(`Progress: ${this.pageName} - ${getProgressBarPercentage(this.pageName)}`);
             return getProgressBarPercentage(this.pageName);
         },
     },

From 73ec3ce9ee682b126e654cda79bb585a0dfea5d8 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 12:27:28 -0400
Subject: [PATCH 36/64] Load session before updating funnel cookie

---
 src/router/methods/before-each.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 84514f6c2..3a293f98b 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -52,6 +52,12 @@ export async function beforeEach(to, from) {
             }
         }
 
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
@@ -61,12 +67,6 @@ export async function beforeEach(to, from) {
             debugLog(" funnel cookie after: ", getFunnelCookie());
         }
 
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
         // Update if logging is enabled.
         checkLogParam();
 

From d8c838f530a5183809de3068afd2e83ee51aba19 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:24:59 -0400
Subject: [PATCH 37/64] Revert "Load session before updating funnel cookie"

This reverts commit 73ec3ce9ee682b126e654cda79bb585a0dfea5d8.
---
 src/router/methods/before-each.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 3a293f98b..84514f6c2 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -52,12 +52,6 @@ export async function beforeEach(to, from) {
             }
         }
 
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
@@ -67,6 +61,12 @@ export async function beforeEach(to, from) {
             debugLog(" funnel cookie after: ", getFunnelCookie());
         }
 
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
         // Update if logging is enabled.
         checkLogParam();
 

From efc354699aa008d98b181c0067242cc88b92d540 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:25:09 -0400
Subject: [PATCH 38/64] Revert "Remove console log"

This reverts commit c48f16bb992422bb82093d98379e86f1251cc386.
---
 src/fmg-components/funnel-header/progress-bar/progress-bar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index ebce6e0de..c25476338 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -13,6 +13,7 @@ export default {
     data() {},
     computed: {
         progress() {
+            console.log(`Progress: ${this.pageName} - ${getProgressBarPercentage(this.pageName)}`);
             return getProgressBarPercentage(this.pageName);
         },
     },

From fa5b4bd4cc1f5e1e088ccc2a4881b646fff15497 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:25:24 -0400
Subject: [PATCH 39/64] Revert "Progress bar cleanup"

This reverts commit 5f7840057a9c1ff8451ee31e47078ea298e4cae3.
---
 .../funnel-header/progress-bar/progres-bar.spec.js |  8 ++++----
 .../funnel-header/progress-bar/progress-bar.vue    | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
index 9970b266c..a8d22cc2c 100644
--- a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
+++ b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
@@ -15,7 +15,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(0);
+        expect(wrapper.vm.getProgress()).toBe(0);
         wrapper.unmount();
     });
 });
@@ -33,7 +33,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(4);
+        expect(wrapper.vm.getProgress()).toBe(4);
         wrapper.unmount();
     });
 });
@@ -51,7 +51,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(48);
+        expect(wrapper.vm.getProgress()).toBe(48);
         wrapper.unmount();
     });
 });
@@ -69,7 +69,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(100);
+        expect(wrapper.vm.getProgress()).toBe(100);
         wrapper.unmount();
     });
 });
diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index c25476338..da370e415 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -10,11 +10,15 @@ import { getProgressBarPercentage } from "@/constants/progress-bar-mapper";
 
 export default {
     name: "progressBar",
-    data() {},
-    computed: {
-        progress() {
-            console.log(`Progress: ${this.pageName} - ${getProgressBarPercentage(this.pageName)}`);
-            return getProgressBarPercentage(this.pageName);
+    data() {
+        return {
+            progress: this.getProgress(),
+        };
+    },
+    methods: {
+        getProgress() {
+            var pageName = this.pageName;
+            return getProgressBarPercentage(pageName);
         },
     },
 };

From 47f3a6cee9b82a307d822cb574c7eca643378911 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:25:34 -0400
Subject: [PATCH 40/64] Revert "prettier"

This reverts commit 0b7e4f578b8b11499cf8b498432139c456a81879.
---
 src/router/methods/before-each.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 84514f6c2..734385700 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -90,6 +90,7 @@ export async function beforeEach(to, from) {
         {
             debugLog("--- before-each.js end ---");
         }
+
     } catch (error) {
         const errorPayload = {
             cause: "Uncaught exception in `beforeEach`.",

From 25dfa5d74c6343deedbe2acc1856c2e7d821d93a Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:25:51 -0400
Subject: [PATCH 41/64] Revert "debug return from heritage"

This reverts commit 910fe50702e52855f61ef7894512a6e3e9062c06.
---
 src/router/methods/before-each.js | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 734385700..aa4e3a9e4 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -14,18 +14,11 @@ import { runExperiments } from "@/router/methods/helpers/run-experiments";
 import { bailout } from "@/router/methods/error";
 import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 import { checkLogParam } from "@/helpers/debug-log-helper";
-import { debugLog } from "@/helpers/debug-log-helper";
 
 export async function beforeEach(to, from) {
     try {
         await analyticsMixin.methods.validateSession();
 
-        // prettier-ignore
-        {
-            debugLog(`--- before-each.js ${from?.name} start ---`);
-            debugLog(" funnel cookie init: ", getFunnelCookie());
-        }
-
         if (getFunnelCookie()?.SuppressConceptFunnel) {
             // Redirect to heritage.
             return {
@@ -55,12 +48,6 @@ export async function beforeEach(to, from) {
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
-        // prettier-ignore
-        {
-            debugLog(`--- before-each.js ${from?.name} start ---`);
-            debugLog(" funnel cookie after: ", getFunnelCookie());
-        }
-
         // If sent from heritage, need to load session.
         const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
         if (fromHeritageFlag) {
@@ -85,12 +72,6 @@ export async function beforeEach(to, from) {
         }
 
         await runExperiments(to.name);
-
-        // prettier-ignore
-        {
-            debugLog("--- before-each.js end ---");
-        }
-
     } catch (error) {
         const errorPayload = {
             cause: "Uncaught exception in `beforeEach`.",

From a0dfd151e1133ce0bfb60546a9026efa273f4e5a Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:27:38 -0400
Subject: [PATCH 42/64] Revert "Only save session on nav if email or phone
 number is present"

This reverts commit 4d481bfd775677123ea52d499975dd3a1e73eb66.
---
 src/router/methods/navigate.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/router/methods/navigate.js b/src/router/methods/navigate.js
index b15c955e9..7df947560 100644
--- a/src/router/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -3,7 +3,6 @@ import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
 import { getDestination } from "@/router/methods/helpers/get-destination";
 import { savePageData } from "@/router/methods/helpers/save-page-data";
 import router from "@/router";
-import store from "@/store";
 
 import { bailout } from "@/router/methods/error";
 
@@ -35,12 +34,7 @@ async function navigate(scenario, currentPageName, withSaving = false, forceTopL
     }
 
     if (withSaving) {
-        if (
-            store.getters?.applicationUser?.savedSessionId ||
-            store.getters?.order?.customer?.emailAddress
-        ) {
-            await saveSession({ pageNameToLog: nextPage.name });
-        }
+        await saveSession({ pageNameToLog: nextPage.name });
     }
 
     // Some pages require manually setting the next url

From 2d65f850f1e98a0f5511300af3d23593aaa9ce77 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:27:56 -0400
Subject: [PATCH 43/64] Revert "Update logging for new router."

This reverts commit f0fa576ba2085f89219a0ec12f2bc0ceb7a09e02.
---
 src/helpers/debug-log-helper.js               | 23 ------
 .../heritage-integration/navigation-helper.js | 12 +--
 src/layouts/payment-method/payment-method.vue | 40 +++++-----
 src/layouts/payment/payment.vue               | 80 ++++++++-----------
 src/layouts/quote/quote.vue                   | 46 +++++++----
 src/layouts/schedule/schedule.vue             | 22 ++---
 src/layouts/vehicle/vehicle.vue               | 14 ++--
 src/mixins/base-mixin.js                      |  7 +-
 src/router/methods/before-each.js             |  4 -
 9 files changed, 116 insertions(+), 132 deletions(-)
 delete mode 100644 src/helpers/debug-log-helper.js

diff --git a/src/helpers/debug-log-helper.js b/src/helpers/debug-log-helper.js
deleted file mode 100644
index ea0ac3337..000000000
--- a/src/helpers/debug-log-helper.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import store from "@/store";
-import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import { queryStrings } from "@/constants/query-strings";
-import { storeActions } from "@/constants/store-actions";
-
-export function debugLog(message, data, forceLog = false) {
-    checkLogParam();
-
-    if (store?.getters?.applicationUser?.loggingOption || forceLog) {
-        data = data ?? "";
-        const outData = typeof data === "object" ? JSON.stringify(data) : data;
-
-        console.log(`${new Date()} ${message} ${outData}`);
-    }
-}
-
-export function checkLogParam() {
-    const logQueryString = getQuerystringParameter(queryStrings.LOG);
-
-    if (logQueryString) {
-        store?.dispatch(storeActions?.SAVE_LOGGING_OPTION, logQueryString);
-    }
-}
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 90f9593b9..ca547b980 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -8,16 +8,18 @@ import { includesWindshieldReplacement } from "@/helpers/damage-helper";
 import { applicationConfig } from "@/constants/application-config.js";
 import store from "@/store";
 import router from "@/router";
-import { debugLog } from "@/helpers/debug-log-helper";
 
 /*
     Used to navigate to the heritage funnel with the correct query string and url.
 */
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
-    debugLog("--- Navigate to heritage start ---");
-    debugLog("applicationConfig:", applicationConfig);
-    debugLog("navigateToHeritageFunnel:", applicationConfig.HERITAGE_FUNNEL);
-    debugLog("--- Navigate to heritage end ---");
+    const log = getQuerystringParameter(queryStrings.LOG);
+    if (log === "true") {
+        console.log("------------- Navigate to heritage start -----------------");
+        console.log(new Date() + " applicationConfig: " + JSON.stringify(applicationConfig));
+        console.log(new Date() + " navigateToHeritageFunnel: " + applicationConfig.HERITAGE_FUNNEL);
+        console.log("------------- Navigate to heritage end -----------------");
+    }
 
     // Create the order (or save existing order) when navigating to Heritage Funnel.
     if (shouldSaveSession) {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index e0de7fc0f..e2debfe4a 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,7 +168,6 @@ import {
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
 import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
-import { debugLog } from "@/helpers/debug-log-helper";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -441,25 +440,26 @@ export default {
 
             // prettier-ignore
             {
-                debugLog("--- payment-method.vue pagePrereqs start ---", null, !preReqResult);
-                debugLog("serviceLocationRequs::isMobile:", isMobile, !preReqResult);
-                debugLog("serviceLocationReqs::mobileReqs:", mobileReqs, !preReqResult);
-                debugLog("serviceLocationReqs::dropOffInshopReqs:", dropOffInshopReqs, !preReqResult);
-                debugLog("serviceLocationReqs:: result", serviceLocationReqs, !preReqResult);
-
-                debugLog("isInsuranceSet::", isInsuranceSet(), !preReqResult);
-
-                debugLog("scheduleReqs::schedule.date:", schedule.date, !preReqResult);
-                debugLog("scheduleReqs::schedule.startTime:", schedule.startTime, !preReqResult);
-                debugLog("scheduleReqs::schedule.endTime:", schedule.endTime, !preReqResult);
-                debugLog("scheduleReqs::schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
-                debugLog("scheduleReqs::schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
-
-                debugLog("customerReqs::customer.firstName:", customer.firstName, !preReqResult);
-                debugLog("customerReqs::customer.lastName:", customer.lastName, !preReqResult);
-                debugLog("customerReqs::customer.phoneNumber:", customer.phoneNumber, !preReqResult);
-                debugLog("customerReqs::customer.emailAddress:", customer.emailAddress, !preReqResult);
-                debugLog("--- payment-method.vue pagePrereqs end ---", null, !preReqResult);
+                const log = getQuerystringParameter(queryStrings.LOG);
+                const logAsBool = getBoolFromString(log);
+                if (logAsBool || !preReqResult) {
+                    console.log("------------- payment-method.vue pagePrereqs start -----------------");
+                    console.log(new Date() + " serviceLocationReqs::isMobile: " + isMobile);
+                    console.log(new Date() + " serviceLocationReqs::mobileReqs: " + mobileReqs);
+                    console.log(new Date() + " serviceLocationReqs::dropOffInshopReqs: " + dropOffInshopReqs);
+                    console.log(new Date() + " serviceLocationReqs:: result " + serviceLocationReqs);
+                    console.log(new Date() + " isInsuranceSet:: " + isInsuranceSet());
+                    console.log(new Date() + " scheduleReqs::schedule.date:" + schedule.date);
+                    console.log(new Date() + " scheduleReqs::schedule.startTime:" + schedule.startTime);
+                    console.log(new Date() + " scheduleReqs::schedule.endTime:" + schedule.endTime);
+                    console.log(new Date() + " scheduleReqs::schedule.jobMaxMinutes:" + schedule.jobMaxMinutes);
+                    console.log(new Date() + " scheduleReqs::schedule.jobMinMinutes:" + schedule.jobMinMinutes);
+                    console.log(new Date() + " customerReqs::customer.firstName:" + customer.firstName);
+                    console.log(new Date() + " customerReqs::customer.lastName:" + customer.lastName);
+                    console.log(new Date() + " customerReqs::customer.phoneNumber:" + customer.phoneNumber);
+                    console.log(new Date() + " customerReqs::customer.emailAddress:" + customer.emailAddress);
+                    console.log("------------- payment-method.vue pagePrereqs end -----------------");
+                }
             }
 
             return preReqResult;
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 745d5ebe1..40d772dbb 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -238,7 +238,6 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { debugLog } from "@/helpers/debug-log-helper.js";
 
 export default {
     name: "payment",
@@ -546,50 +545,41 @@ export default {
 
             // prettier-ignore
             {
-                debugLog("--- payment.vue pagePrereqs start ---", null, !preReqResult);
-                debugLog("mobileReqs:", mobileReqs, !preReqResult);
-                debugLog("serviceLocation.address:", serviceLocation.address, !preReqResult);
-                debugLog("serviceLocation.city:", serviceLocation.city, !preReqResult);
-                debugLog("serviceLocation.state:", serviceLocation.state, !preReqResult);
-                debugLog("serviceLocation.zipCode:", serviceLocation.zipCode, !preReqResult);
-
-                debugLog("", null, !preReqResult);
-
-                debugLog("dropOffInshopReqs:", dropOffInshopReqs, !preReqResult);
-                debugLog("serviceLocationReqs:", serviceLocationReqs, !preReqResult);
-                debugLog("providerLocation.streetAddress:", providerLocation.streetAddress, !preReqResult);
-                debugLog("providerLocation.city:", providerLocation.city, !preReqResult);
-                debugLog("providerLocation.state:", providerLocation.state, !preReqResult);
-                debugLog("providerLocation.zipCode:", providerLocation.zipCode, !preReqResult);
-                
-                debugLog("", null, !preReqResult);
-                
-                debugLog("isInsuranceSet:", isInsuranceSet, !preReqResult);
-
-                debugLog("", null, !preReqResult);
-
-                debugLog("scheduleReqs:", scheduleReqs, !preReqResult);
-                debugLog("schedule.date:", schedule.date, !preReqResult);
-                debugLog("schedule.startTime:", schedule.startTime, !preReqResult);
-                debugLog("schedule.endTime:", schedule.endTime, !preReqResult);
-                debugLog("schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
-                debugLog("schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
-                
-                debugLog("", null, !preReqResult);
-
-                debugLog("customerReqs:", customerReqs, !preReqResult);
-                debugLog("customer.firstName:", customer.firstName, !preReqResult);
-                debugLog("customer.lastName:", customer.lastName, !preReqResult);
-                debugLog("customer.phoneNumber:", customer.phoneNumber, !preReqResult);
-                debugLog("customer.emailAddress:", customer.emailAddress, !preReqResult);
-                
-                debugLog("", null, !preReqResult);
-
-                debugLog("paymentMethodReqs:", paymentMethodReqs, !preReqResult);
-                debugLog("store.getters.order.payment.isPia:", store.getters.order?.payment?.isPia, !preReqResult);
-                debugLog("store.getters.order.payment.piaType:", store.getters.order?.payment?.piaType, !preReqResult);
-
-                debugLog("--- payment.vue pagePrereqs end ---", null, !preReqResult);
+                if (store.getters.applicationUser.loggingOption || !preReqResult) {
+                    console.log("------------- payment.vue pagePrereqs start -----------------");
+                    console.log(new Date() +  "mobileReqs:" + mobileReqs);
+                    console.log(new Date() +  "serviceLocation.address:" + serviceLocation.address);
+                    console.log(new Date() +  "serviceLocation.city:" + serviceLocation.city);
+                    console.log(new Date() +  "serviceLocation.state:" + serviceLocation.state);
+                    console.log(new Date() +  "serviceLocation.zipCode:" + serviceLocation.zipCode);
+                    console.log("");
+                    console.log(new Date() +  "dropOffInshopReqs:" + dropOffInshopReqs);
+                    console.log(new Date() +  "serviceLocationReqs:" + serviceLocationReqs);
+                    console.log(new Date() +  "providerLocation.streetAddress:" + providerLocation.streetAddress);
+                    console.log(new Date() +  "providerLocation.city:" + providerLocation.city);
+                    console.log(new Date() +  "providerLocation.state:" + providerLocation.state);
+                    console.log(new Date() +  "providerLocation.zipCode:" + providerLocation.zipCode);
+                    console.log("");
+                    console.log(new Date() +  "isInsuranceSet:" + isInsuranceSet);
+                    console.log("");
+                    console.log(new Date() +  "scheduleReqs:" + scheduleReqs);
+                    console.log(new Date() +  "schedule.date:" + schedule.date);
+                    console.log(new Date() +  "schedule.startTime:" + schedule.startTime);
+                    console.log(new Date() +  "schedule.endTime:" + schedule.endTime);
+                    console.log(new Date() +  "schedule.jobMaxMinutes:" + schedule.jobMaxMinutes);
+                    console.log(new Date() +  "schedule.jobMinMinutes:" + schedule.jobMinMinutes);
+                    console.log("");
+                    console.log(new Date() +  "customerReqs:" + customerReqs);
+                    console.log(new Date() +  "customer.firstName:" + customer.firstName);
+                    console.log(new Date() +  "customer.lastName:" + customer.lastName);
+                    console.log(new Date() +  "customer.phoneNumber:" + customer.phoneNumber);
+                    console.log(new Date() +  "customer.emailAddress:" + customer.emailAddress);
+                    console.log("");
+                    console.log(new Date() +  "paymentMethodReqs:" + paymentMethodReqs);
+                    console.log(new Date() +  "store.getters.order.payment.isPia:" + store.getters.order.payment.isPia);
+                    console.log(new Date() +  "store.getters.order.payment.piaType:" + store.getters.order.payment.piaType);
+                    console.log("------------- payment.vue pagePrereqs end -------------------");
+                }
             }
 
             return preReqResult;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index e7039da54..a31719dbd 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -171,7 +171,6 @@ import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { routeData } from "@/router/constants/routes";
 import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
-import { debugLog } from "@/helpers/debug-log-helper";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -463,7 +462,9 @@ export default {
                         baseMixin.methods.getTierOnePackagePrice(lineItemsNoDiscount);
                     // prettier-ignore
                     {
-                        debugLog("quote tierOnePrice comparison: " + tierOnePrice + " > " + insuranceThreshold + "=" + (tierOnePrice > insuranceThreshold));
+                        if (store.getters.applicationUser.loggingOption) {
+                            console.log(new Date() + " quote tierOnePrice comparison: " + tierOnePrice + " > " + insuranceThreshold + "=" + (tierOnePrice > insuranceThreshold));
+                        }
                     }
 
                     // compare base price vs arbitrary threshold (representing insurance price)
@@ -484,17 +485,21 @@ export default {
 
             // prettier-ignore
             {
-                debugLog("--- quote.vue thresholds start ---");
-                debugLog(" isExternalParameter: ", isExternalParameter);
-                debugLog(" internalThreshold: ", internalThreshold);
-                debugLog(" externalThreshold: ", externalThreshold);
-                debugLog("--- quote.vue thresholds end ---");
+                if (store.getters.applicationUser.loggingOption) {
+                    console.log("------------- quote.vue thresholds start -----------------");
+                    console.log(new Date() + " isExternalParameter: " + isExternalParameter);
+                    console.log(new Date() + " internalThreshold: " + internalThreshold);
+                    console.log(new Date() + " externalThreshold: " + externalThreshold);
+                    console.log("------------- quote.vue thresholds end -----------------");
+                }
             }
 
             if (isExternalParameter === externalParameterStatus.NOT_SET) {
                 // prettier-ignore
                 {
-                    debugLog("quote.vue tab select EXTERNAL not set");
+                    if (store.getters.applicationUser.loggingOption) {
+                        console.log(new Date() + "quote.vue tab select EXTERNAL not set");
+                    }
                 }
                 // there are no active or inactive external parameters; use internal threshold
                 if (internalThreshold) thresholdToUse = internalThreshold;
@@ -509,7 +514,9 @@ export default {
                 if (getBoolFromString(store.getters.externalParameterQuote?.isInsurance)) {
                     // prettier-ignore
                     {
-                        debugLog("quote.vue tab select EXTERNAL ISINSURANCE");
+                        if (store.getters.applicationUser.loggingOption) {
+                            console.log(new Date() + "quote.vue tab select EXTERNAL ISINSURANCE");
+                        }
                     }
 
                     const insuranceSelection = true;
@@ -528,7 +535,9 @@ export default {
 
                     // prettier-ignore
                     {
-                        debugLog("quote.vue tab select NOT EXTERNAL");
+                        if (store.getters.applicationUser.loggingOption) {
+                            console.log(new Date() + "quote.vue tab select NOT EXTERNAL");
+                        }
                     }
 
                     vm.isInsuranceSelected = getIsInsuranceSelectedValue(
@@ -644,13 +653,16 @@ export default {
 
             // prettier-ignore
             {
-                debugLog("--- quote.vue pagePrereqs start ---", null, !preReqResult);
-                debugLog("store.getters.order.serviceLocation.zipCode:", store.getters.order.serviceLocation?.zipCode, !preReqResult);
-                debugLog("store.getters.order.serviceLocation.zipCodeCtu:", store.getters.order.serviceLocation?.zipCodeCtu, !preReqResult);
-                debugLog("store.getters.order.damage.isRepair:", store.getters.order.damage?.isRepair, !preReqResult);
-                debugLog("store.getters.order.lineItems?.glassParts:", store.getters.order.lineItems?.glassParts, !preReqResult);
-                debugLog("store.getters.order.payemt.insuranceCoverage?.isVerified:", store.getters.order.payment?.insuranceCoverage?.isVerified, !preReqResult);
-                debugLog("--- quote.vue pagePrereqs end ---", null, !preReqResult);
+                const log = getQuerystringParameter(queryStrings.LOG);
+                if (log === "true" || !preReqResult) {
+                    console.log("------------- quote.vue pagePrereqs start -----------------");
+                    console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + store.getters.order.serviceLocation?.zipCode);
+                    console.log(new Date() +" store.getters.order.serviceLocation.zipCodeCtu: " + store.getters.order.serviceLocation?.zipCodeCtu);
+                    console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage?.isRepair);
+                    console.log(new Date() + " store.getters.order.lineItems?.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts));
+                    console.log(new Date() + " store.getters.order.payment.insuranceCoverage?.isVerified: " + payment?.insuranceCoverage?.isVerified);
+                    console.log("------------- quote.vue pagePrereqs end -----------------");
+                }
             }
 
             return preReqResult;
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b752a5d22..b47de1fa8 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -94,7 +94,6 @@ import { getAmountDue, getPricingByDayPartWithPrice } from "@/helpers/pricing-he
 import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
 import { partNumberStrings } from "@/constants/part-number-strings";
 import { deepClone } from "@/helpers/object-helper";
-import { debugLog } from "@/helpers/debug-log-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("date-required", required(errorMessages.DATE_REQUIRED));
@@ -429,15 +428,18 @@ export default {
 
             // prettier-ignore
             {
-                debugLog("--- schedule.vue pagePrereqs start ---", null, !preReqResult);
-                debugLog("store.getters.order.serviceLocation.zipCode:", serviceLocation.zipCode, !preReqResult);
-                debugLog("store.getters.order.serviceLocation.zipCodeCtu:", serviceLocation.zipCodeCtu, !preReqResult);
-                debugLog("store.getters.order.serviceLocation.appointmentType:", serviceLocation.appointmentType, !preReqResult);
-                debugLog("store.getters.order.serviceLocation.provider.providerNumber:", serviceLocation.provider?.providerNumber, !preReqResult);
-                debugLog("store.getters.payment.isInsurance:", store.getters.payment?.isInsurance, !preReqResult);
-                debugLog("store.getters.order.damage.isRepair:", store.getters.order.damage?.isRepair, !preReqResult);
-                debugLog("store.getters.order.lineItems.glassParts:", store.getters.order.lineItems?.glassParts, !preReqResult);
-                debugLog("--- schedule.vue pagePrereqs end ---", null, !preReqResult);
+                const log = getQuerystringParameter(queryStrings.LOG);
+                if (log === "true" || !preReqResult) {
+                    console.log("------------- schedule.vue pagePrereqs start -----------------");
+                    console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + serviceLocation.zipCode);
+                    console.log(new Date() + " store.getters.order.serviceLocation.zipCodeCtu: " + serviceLocation.zipCodeCtu);
+                    console.log(new Date() + " store.getters.order.serviceLocation.appointmentType: " + serviceLocation.appointmentType);
+                    console.log(new Date() + " store.getters.order.serviceLocation.provider.providerNumber: " + serviceLocation.provider.providerNumber);
+                    console.log(new Date() + " store.getters.payment.isInsurance: " + store.getters.payment?.isInsurance);
+                    console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage.isRepair);
+                    console.log(new Date() + " store.getters.order.lineItems.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts));
+                    console.log("------------- schedule.vue pagePrereqs end -------------------");
+                }
             }
             return preReqResult;
         },
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 131073f90..174c76530 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -114,7 +114,6 @@ import {
     consumeQueryFromStash,
     peekQueryFromStash,
 } from "@/router/methods/helpers/querystring-stash";
-import { debugLog } from "@/helpers/debug-log-helper";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
@@ -149,10 +148,15 @@ export default {
     },
 
     async beforeRouteEnter(to, from, next) {
-        debugLog("------------- vehicle.vue applicationConfig start -------------");
-        debugLog("", applicationConfig);
-        debugLog("------------- vehicle.vue applicationConfig end -------------");
-
+        if (store.getters.applicationUser.loggingOption) {
+            console.log(
+                new Date() + "------------- vehicle.vue applicationConfig start -------------"
+            );
+            console.log(new Date() + JSON.stringify(applicationConfig));
+            console.log(
+                new Date() + "------------- vehicle.vue applicationConfig end -------------"
+            );
+        }
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.name);
         const experimentForLogging = store.getters.applicationUser.experiments.find(
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index ecce2632d..3dfca7dbf 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -9,7 +9,6 @@ import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
-import { debugLog } from "@/helpers/debug-log-helper";
 
 export default {
     data() {
@@ -96,8 +95,10 @@ export default {
             let totalPrice = this.getTotalPriceOfAllLineItemsAndChildParts(lineItemsToPrice, false);
             // prettier-ignore
             {
-                debugLog("base-mixin getTierOnePackagePrice lineItemsToPrice:", lineItemsToPrice);
-                debugLog("base-mixin getTierOnePackagePrice totalPrice:", totalPrice);
+                if (store.getters.applicationUser.loggingOption) {
+                    console.log(new Date() + " base-mixin getTierOnePackagePrice lineItemsToPrice: " + JSON.stringify(lineItemsToPrice));
+                    console.log(new Date() + " base-mixin getTierOnePackagePrice totalPrice: " + totalPrice);
+                }
             }
             return totalPrice;
         },
diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index aa4e3a9e4..dae53b583 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -13,7 +13,6 @@ import { runExperiments } from "@/router/methods/helpers/run-experiments";
 
 import { bailout } from "@/router/methods/error";
 import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
-import { checkLogParam } from "@/helpers/debug-log-helper";
 
 export async function beforeEach(to, from) {
     try {
@@ -54,9 +53,6 @@ export async function beforeEach(to, from) {
             await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
         }
 
-        // Update if logging is enabled.
-        checkLogParam();
-
         // Ensure page-prerequisites are fulfilled
         const arePagePrerequisitesValid = await checkPagePrerequisites(to.name);
 

From 8cd4231ab52442acdee91cde91717ac4195180fc Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:30:35 -0400
Subject: [PATCH 44/64] Revert "prettier"

This reverts commit ed8aefd67517dd290f915dbf19fa1cb4ac8b5870.
---
 src/helpers/unit-test-helper.js                         | 4 +---
 src/layouts/estimate/estimate.spec.js                   | 2 +-
 src/layouts/insurance-company/insurance-company.spec.js | 2 +-
 src/layouts/return-user/return-user.vue                 | 7 ++++++-
 src/mixins/vehicle-questions-mixin.spec.js              | 7 ++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 9ac3edde9..8f3d04183 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -77,9 +77,7 @@ export function getMountOptions(mockData) {
         mixins: mockData.mixins,
         stubs: { Form },
         computed: {
-            pageName() {
-                return mockData?.route?.name;
-            },
+            pageName() { return mockData?.route?.name },
         },
     };
     const props = mockData.propsData || {};
diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 5217325f9..38b4ad41e 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -263,7 +263,7 @@ function setupMocks({
             navigateWithoutSaving: jest.fn(),
         },
         route: {
-            name: "estimate",
+            name: "estimate"
         },
     },
 }) {
diff --git a/src/layouts/insurance-company/insurance-company.spec.js b/src/layouts/insurance-company/insurance-company.spec.js
index 7df1f047a..540866d5f 100644
--- a/src/layouts/insurance-company/insurance-company.spec.js
+++ b/src/layouts/insurance-company/insurance-company.spec.js
@@ -26,7 +26,7 @@ jest.mock("@/mixins/base-mixin.js", () => ({
         return {
             navigationScenarios: {
                 CLICKED_BACK: "clicked_back",
-                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own",
+                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own"
             },
         };
     },
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 5b397ea76..91df48150 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -90,7 +90,12 @@ export default {
         },
 
         async startOver() {
-            this.pushEventToGA(this.pageName, this.GaActions.CLICKED, "Start over", true);
+            this.pushEventToGA(
+                this.pageName,
+                this.GaActions.CLICKED,
+                "Start over",
+                true
+            );
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_RESTART,
                 this.pageName
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 0fd027258..558adadd0 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -305,10 +305,7 @@ describe("vehicle-questions-mixin", () => {
                 const { wrapper } = setupMocks({});
 
                 // Act
-                const result = wrapper.vm.currentPageComesBeforePage(
-                    currentPage.name,
-                    nextPage.name
-                );
+                const result = wrapper.vm.currentPageComesBeforePage(currentPage.name, nextPage.name);
 
                 // Assert
                 expect(result).toEqual(expectedResult);
@@ -2422,7 +2419,7 @@ function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
             },
         },
         route: {
-            name: fmgPage,
+            name: fmgPage
         },
     });
 

From ec782996dfa777d4ed099ead3e0fdfdb027c1a02 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:30:45 -0400
Subject: [PATCH 45/64] Revert "Unit tests"

This reverts commit ef34d643058093f51df5d6ca88c25ac9176df285.
---
 .../button-question/button-question.spec.js   |   2 +-
 .../progress-bar/progres-bar.spec.js          |  29 +-
 .../questions-page-layout.spec.js             |   1 -
 src/global-methods.spec.js                    |   2 +-
 .../navigation-helper.spec.js                 | 473 +++++++++++++++++-
 src/helpers/unit-test-helper.js               |   3 -
 .../address-lookup/address-lookup.spec.js     |  11 +-
 src/layouts/estimate/estimate.spec.js         |   8 +-
 .../insurance-company.spec.js                 |   8 +-
 .../molding-questions.spec.js                 |   1 -
 src/layouts/payment/payment.spec.js           |   8 +-
 src/layouts/quote/quote.spec.js               |   4 +-
 src/layouts/return-user/return-user.spec.js   |  14 +-
 src/layouts/return-user/return-user.vue       |   2 +-
 src/layouts/schedule/schedule.spec.js         |   7 +-
 src/layouts/service-zip/service-zip.spec.js   |  27 +-
 .../vehicle-damage/vehicle-damage.spec.js     |  20 +-
 .../vehicle-parts/vehicle-parts.spec.js       |  51 +-
 src/layouts/vin-lookup/vin-lookup.spec.js     |   2 +-
 src/mixins/base-mixin.spec.js                 |   2 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 135 ++---
 src/mixins/vin-pages-mixin.spec.js            |   3 -
 src/store/store.spec.js                       |  46 +-
 23 files changed, 678 insertions(+), 181 deletions(-)

diff --git a/src/digital-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
index 73c048936..3b7a4e80e 100644
--- a/src/digital-components/button-question/button-question.spec.js
+++ b/src/digital-components/button-question/button-question.spec.js
@@ -1143,7 +1143,7 @@ describe("buttonQuestion.vue", () => {
 });
 
 function setupMocks(mountOptionsMockData = {}) {
-    const defaultMountOptions = { route: { name: "page-name" } };
+    const defaultMountOptions = { route: { query: { fmgPage: "page-name" } } };
     const baseMountOptions = getMountOptions(
         Object.assign(defaultMountOptions, mountOptionsMockData)
     );
diff --git a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
index a8d22cc2c..92e6e15a5 100644
--- a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
+++ b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
@@ -5,9 +5,6 @@ import store from "@/store";
 describe("progressBar", () => {
     test("progress should be 0", () => {
         // Arrange
-        mockMixin.computed = {
-            pageName: () => undefined,
-        };
 
         // Act
         const wrapper = shallowMount(progressBar, {
@@ -15,7 +12,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(0);
+        expect(wrapper.vm.progress).toBe(0);
         wrapper.unmount();
     });
 });
@@ -23,8 +20,10 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 4%", () => {
         // Arrange
-        mockMixin.computed = {
-            pageName: () => "vehicle",
+        store.getters = {
+            applicationUser: {
+                lastPageVisited: "vehicle",
+            },
         };
 
         // Act
@@ -33,7 +32,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(4);
+        expect(wrapper.vm.progress).toBe(4);
         wrapper.unmount();
     });
 });
@@ -41,8 +40,10 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 48%", () => {
         // Arrange
-        mockMixin.computed = {
-            pageName: () => "quote",
+        store.getters = {
+            applicationUser: {
+                lastPageVisited: "quote",
+            },
         };
 
         // Act
@@ -51,7 +52,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(48);
+        expect(wrapper.vm.progress).toBe(48);
         wrapper.unmount();
     });
 });
@@ -59,8 +60,10 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 100%", () => {
         // Arrange
-        mockMixin.computed = {
-            pageName: () => "confirmation",
+        store.getters = {
+            applicationUser: {
+                lastPageVisited: "confirmation",
+            },
         };
 
         // Act
@@ -69,7 +72,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(100);
+        expect(wrapper.vm.progress).toBe(100);
         wrapper.unmount();
     });
 });
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
index 96e5434cd..38b0f3d16 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
@@ -245,7 +245,6 @@ function setupMocks() {
     };
     const mountOptions = getMountOptions({
         mixins: [baseMixin, vehicleQuestionsMixin],
-        route: { name: "questions" },
     });
     mountOptions["attachTo"] = document.body;
     const wrapper = shallowMount(questionsPageLayout, mountOptions);
diff --git a/src/global-methods.spec.js b/src/global-methods.spec.js
index c09bf8e97..e6c0e4858 100644
--- a/src/global-methods.spec.js
+++ b/src/global-methods.spec.js
@@ -38,7 +38,7 @@ it("Global Methods - Call Http Client - Should Reject Promise", () => {
         isError: true,
     });
     analyticsMixIn.methods.pushEventToGA = jest.fn();
-    router.bailout = jest.fn();
+    router.navigateError = jest.fn();
 
     //Act
     globalMethods.callHttpClient(httpArgs).catch((err) => {
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 752c98fdc..396b4eee1 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -1,11 +1,12 @@
 import * as navigationHelper from "@/helpers/heritage-integration/navigation-helper";
 import * as orderHelper from "@/helpers/heritage-integration/order-helper";
-import { lazyLoadComponent } from "@/router/methods/helpers/lazy-load-component";
+import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
 import { setupMocksForJsFiles, getMockOrderInfo } from "@/helpers/unit-test-helper.js";
-import { externalUrls } from "@/router/constants/externalUrl-values";
+import { externalUrls } from "@/router/router-constants/externalUrl-values";
 import { queryStrings } from "@/constants/query-strings";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 
 import { damageLocationsSelected as glassLocations } from "@/constants/damage-locations-selected";
 
@@ -16,10 +17,476 @@ const getPageToRouteExistingOrderTo = navigationHelper.getPageToRouteExistingOrd
 const navigateToHeritageFunnel = navigationHelper.navigateToHeritageFunnel;
 
 // Mock Lazy Load
-jest.mock("@/router/methods/helpers/lazy-load-component", () => ({
+jest.mock("@/router/dynamic-routing/component-loader.js", () => ({
     lazyLoadComponent: jest.fn(),
 }));
 
+describe("getPageToRouteExistingOrderTo", () => {
+    describe("Explicit vs. Implicit Routing", () => {
+        test("Should call explicit routing if `fmgPage` parameter is present in query", async () => {
+            // Arrange
+            const toRoute = {
+                query: {
+                    fmgPage: "schedule",
+                },
+            };
+
+            mockLazyLoadComponentReturnValues();
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            // Assert
+            // If direct, should be "schedule".
+            // Otherwise, not.
+            expect(result).toBe("schedule");
+        });
+
+        test("Should call implicit routing if `fmgPage` parameter is NOT present in query", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            mockLazyLoadComponentReturnValues();
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            // Assert
+            // If direct, should be "schedule".
+            // Otherwise, not.
+            expect(result).not.toBe("schedule");
+        });
+    });
+
+    describe("Implicit Routing", () => {
+        test("should return vehicle", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: false,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.VEHICLE);
+        });
+
+        test("should return vehicle-damage", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: false,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.VEHICLE_DAMAGE);
+        });
+
+        test("user has YMMS and no vehicle questions > should return estimate", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            const mockExperimentsList = [
+                {
+                    universeName: "ConceptFunnel",
+                    settings: {
+                        SuppressVinCapture: false,
+                    },
+                },
+            ];
+            store.commit(storeMutations.UPDATE_EXPERIMENTS, mockExperimentsList);
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
+                [fmgPageValues.MOLDING_QUESTIONS]: false,
+                [fmgPageValues.VEHICLE_PARTS]: false,
+                [fmgPageValues.PART_QUESTIONS]: false,
+                [fmgPageValues.VIN_LOOKUP]: true,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.ESTIMATE);
+        });
+
+        test("user has YMMS but no questions or carId > should return estimate", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
+                [fmgPageValues.MOLDING_QUESTIONS]: false,
+                [fmgPageValues.VEHICLE_PARTS]: false,
+                [fmgPageValues.PART_QUESTIONS]: false,
+                [fmgPageValues.VIN_LOOKUP]: false,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.ESTIMATE);
+        });
+
+        test("user has capability questions and molding questions > should return capability questions", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: true,
+                [fmgPageValues.MOLDING_QUESTIONS]: true,
+                [fmgPageValues.VEHICLE_PARTS]: false,
+                [fmgPageValues.PART_QUESTIONS]: false,
+                [fmgPageValues.VIN_LOOKUP]: false,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.CAPABILITY_QUESTIONS);
+        });
+
+        test("user has molding questions and part questions > should return molding questions", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
+                [fmgPageValues.MOLDING_QUESTIONS]: true,
+                [fmgPageValues.VEHICLE_PARTS]: false,
+                [fmgPageValues.PART_QUESTIONS]: true,
+                [fmgPageValues.VIN_LOOKUP]: false,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.MOLDING_QUESTIONS);
+        });
+
+        test("user has vehicle parts questions > should return vehicle-parts", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
+                [fmgPageValues.MOLDING_QUESTIONS]: false,
+                [fmgPageValues.VEHICLE_PARTS]: true,
+                [fmgPageValues.PART_QUESTIONS]: true,
+                [fmgPageValues.VIN_LOOKUP]: false,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.VEHICLE_PARTS);
+        });
+
+        test("user has part questions > should return part-questions", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
+                [fmgPageValues.MOLDING_QUESTIONS]: false,
+                [fmgPageValues.VEHICLE_PARTS]: false,
+                [fmgPageValues.PART_QUESTIONS]: true,
+                [fmgPageValues.VIN_LOOKUP]: false,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.PART_QUESTIONS);
+        });
+
+        test("should return quote, if not verified insurance", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
+                [fmgPageValues.MOLDING_QUESTIONS]: false,
+                [fmgPageValues.VEHICLE_PARTS]: false,
+                [fmgPageValues.PART_QUESTIONS]: true,
+                [fmgPageValues.VIN_LOOKUP]: false,
+                [fmgPageValues.QUOTE]: true,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.QUOTE);
+        });
+
+        test("should not return pages beyond quote even if prerequisites are met", async () => {
+            // Arrange
+            const toRoute = {
+                query: {},
+            };
+
+            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+            // Mock out the lazy load calls for all components.
+            mockLazyLoadComponentReturnValues({
+                [fmgPageValues.VEHICLE]: true,
+                [fmgPageValues.VEHICLE_DAMAGE]: true,
+                [fmgPageValues.ESTIMATE]: true,
+                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
+                [fmgPageValues.MOLDING_QUESTIONS]: false,
+                [fmgPageValues.VEHICLE_PARTS]: false,
+                [fmgPageValues.PART_QUESTIONS]: true,
+                [fmgPageValues.VIN_LOOKUP]: false,
+                [fmgPageValues.QUOTE]: true,
+                [fmgPageValues.SERVICE_LOCATION]: true,
+                [fmgPageValues.SCHEDULE]: true,
+            });
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            //Assert
+            expect(result).toBe(fmgPageValues.QUOTE);
+        });
+    });
+
+    describe("Explicit Routing", () => {
+        test("Returns the value passed in in nominal case", async () => {
+            // Arrange
+            const toRoute = {
+                query: {
+                    fmgPage: "testValue",
+                },
+            };
+
+            // Act
+            const result = await getPageToRouteExistingOrderTo(toRoute);
+
+            // Assert
+            expect(result).toBe("testValue");
+        });
+
+        describe("Verified users", () => {
+            test("Replace navigation to `vehicle` with `vehicle-damage`", async () => {
+                // Arrange
+                const toRoute = {
+                    query: {
+                        fmgPage: fmgPageValues.VEHICLE,
+                    },
+                };
+
+                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
+                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
+
+                // Act
+                const result = await getPageToRouteExistingOrderTo(toRoute);
+
+                // Assert
+                expect(result).toBe(fmgPageValues.VEHICLE_DAMAGE);
+            });
+
+            describe("Vin-Exempt", () => {
+                test("Replace navigation to `quote` with `estimate`", async () => {
+                    // Arrange
+                    const toRoute = {
+                        query: {
+                            fmgPage: fmgPageValues.QUOTE,
+                        },
+                    };
+
+                    store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
+                    store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
+                    store.commit(storeMutations.UPDATE_IS_REPAIR, true);
+                    store.commit(storeMutations.UPDATE_MAKE, "acura");
+
+                    // Act
+                    const result = await getPageToRouteExistingOrderTo(toRoute);
+
+                    // Assert
+                    expect(result).toBe(fmgPageValues.ESTIMATE);
+                });
+            });
+
+            describe("Vin-Required", () => {
+                test("Replace navigation to `quote` with `vin-lookup`", async () => {
+                    // Arrange
+                    const toRoute = {
+                        query: {
+                            fmgPage: fmgPageValues.QUOTE,
+                        },
+                    };
+
+                    store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
+                    store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
+                    store.commit(storeMutations.UPDATE_IS_REPAIR, false);
+                    store.commit(storeMutations.UPDATE_MAKE, "acura");
+                    store.commit(storeMutations.UPDATE_GLASS_TO_REPLACE, [
+                        { glassLocation: glassLocations.WINDSHIELD },
+                    ]);
+                    store.commit(storeMutations.UPDATE_VEHICLE_VIN, "abcd1234");
+
+                    // Act
+                    const result = await getPageToRouteExistingOrderTo(toRoute);
+
+                    // Assert
+                    expect(result).toBe(fmgPageValues.VIN_LOOKUP);
+                });
+            });
+        });
+
+        describe("Non-verified users", () => {
+            test("Don't replace navigation to `vehicle` with `vehicle-damage`", async () => {
+                // Arrange
+                const toRoute = {
+                    query: {
+                        fmgPage: fmgPageValues.VEHICLE,
+                    },
+                };
+
+                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
+                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
+
+                // Act
+                const result = await getPageToRouteExistingOrderTo(toRoute);
+
+                // Assert
+                expect(result).toBe(fmgPageValues.VEHICLE);
+            });
+
+            test("Don't replace navigation to `quote` with `estimate` or `vin-lookup`", async () => {
+                // Arrange
+                const toRoute = {
+                    query: {
+                        fmgPage: fmgPageValues.QUOTE,
+                    },
+                };
+
+                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
+                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
+
+                // Act
+                const result = await getPageToRouteExistingOrderTo(toRoute);
+
+                // Assert
+                expect(result).toBe(fmgPageValues.QUOTE);
+            });
+
+            test("Don't replace navigation to `insurance-company` with `estimate` or `vin-lookup`", async () => {
+                // Arrange
+                const toRoute = {
+                    query: {
+                        fmgPage: fmgPageValues.INSURANCE_COMPANY,
+                    },
+                };
+
+                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
+                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
+
+                // Act
+                const result = await getPageToRouteExistingOrderTo(toRoute);
+
+                // Assert
+                expect(result).toBe(fmgPageValues.INSURANCE_COMPANY);
+            });
+        });
+    });
+});
+
 describe("navigateToHeritageFunnel", () => {
     test("should save session", async () => {
         // Arrange
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 8f3d04183..540f607b0 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -76,9 +76,6 @@ export function getMountOptions(mockData) {
         mocks: mocks,
         mixins: mockData.mixins,
         stubs: { Form },
-        computed: {
-            pageName() { return mockData?.route?.name },
-        },
     };
     const props = mockData.propsData || {};
 
diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js
index 2e3c766d2..87486280f 100644
--- a/src/layouts/address-lookup/address-lookup.spec.js
+++ b/src/layouts/address-lookup/address-lookup.spec.js
@@ -7,7 +7,7 @@ import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 import store from "@/store";
 import { experimentSettings } from "@/constants/experiments";
 
@@ -308,9 +308,11 @@ describe("address-lookup.vue", () => {
             await wrapper.vm.forwardButtonAction();
 
             // Assert
-            expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+            expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
                 undefined,
+                {},
+                {},
                 carsFound
             );
         });
@@ -397,7 +399,9 @@ describe("address-lookup.vue", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                 navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                undefined
+                undefined,
+                {},
+                { displayVehicleChangeAlert: true }
             );
         });
 
@@ -713,7 +717,6 @@ function setupMocks({
                 navigate: jest.fn(),
                 navigateWithSaving: jest.fn(),
                 navigateWithoutSaving: jest.fn(),
-                navigateWithPageData: jest.fn(),
             },
             store: {
                 getters: {
diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 38b4ad41e..74ca7d0bf 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -215,7 +215,7 @@ describe("estimate.vue", () => {
 });
 
 describe("estimate.vue", () => {
-    test.skip("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
+    test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
         store.getters = {
             externalParameterState: { isExternalParameter: true },
             externalParameterEstimate: { vinSelection: "decline" },
@@ -263,7 +263,7 @@ function setupMocks({
             navigateWithoutSaving: jest.fn(),
         },
         route: {
-            name: "estimate"
+            query: {},
         },
     },
 }) {
@@ -271,9 +271,7 @@ function setupMocks({
     const cmsContent = {
         groupName: groupName,
         QuestionText: cmsQuestionText,
-        VinLookupMethod: {
-            Answers: cmsAnswers,
-        },
+        Answers: cmsAnswers,
         FunnelFooterWidget: FunnelFooterWidget,
     };
     const mockMixin = {
diff --git a/src/layouts/insurance-company/insurance-company.spec.js b/src/layouts/insurance-company/insurance-company.spec.js
index 540866d5f..a35be3b87 100644
--- a/src/layouts/insurance-company/insurance-company.spec.js
+++ b/src/layouts/insurance-company/insurance-company.spec.js
@@ -26,7 +26,6 @@ jest.mock("@/mixins/base-mixin.js", () => ({
         return {
             navigationScenarios: {
                 CLICKED_BACK: "clicked_back",
-                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own"
             },
         };
     },
@@ -65,7 +64,7 @@ describe("insurance-company.vue", () => {
         expect(wrapper.vm.isCashParentAccountNumber()).toBe(false);
     });
 
-    test("should call navigateWithoutSaving with CLICKED_PAY_ON_MY_OWN when forceCashSelection is true", () => {
+    test("should call navigateWithoutSaving with { isCashSelected: true } when forceCashSelection is true", () => {
         const wrapper = shallowMount(InsuranceCompany, {
             global: {
                 mocks: {
@@ -78,8 +77,9 @@ describe("insurance-company.vue", () => {
 
         wrapper.vm.backButtonAction(true);
         expect(mockRouter.navigateWithoutSaving).toHaveBeenCalledWith(
-            wrapper.vm.navigationScenarios.CLICKED_PAY_ON_MY_OWN,
-            wrapper.vm.$route
+            wrapper.vm.navigationScenarios.CLICKED_BACK,
+            wrapper.vm.$route,
+            { isCashSelected: true }
         );
     });
 
diff --git a/src/layouts/molding-questions/molding-questions.spec.js b/src/layouts/molding-questions/molding-questions.spec.js
index 8daa6e780..681741c2c 100644
--- a/src/layouts/molding-questions/molding-questions.spec.js
+++ b/src/layouts/molding-questions/molding-questions.spec.js
@@ -336,7 +336,6 @@ function setupMocks({
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
-            navigateWithPageData: jest.fn(),
         },
         store: {
             getters: store.getters,
diff --git a/src/layouts/payment/payment.spec.js b/src/layouts/payment/payment.spec.js
index 05d8bb611..05ad6dbc9 100644
--- a/src/layouts/payment/payment.spec.js
+++ b/src/layouts/payment/payment.spec.js
@@ -599,13 +599,7 @@ describe("payment.vue", () => {
 function setupMocks({ customMountOptions }) {
     const mountOptions = getMountOptions({
         ...customMountOptions,
-        route: { name: "payment-method" },
-        router: {
-            navigateWithSaving: jest.fn(),
-            navigateWithoutSaving: jest.fn(),
-            navigateWithPageData: jest.fn(),
-            navigateAndForceTopLevelNavigation: jest.fn(),
-        },
+        route: { query: { fmgPage: "page-name" }, params: {} },
     });
 
     // set all mock stuff
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index c162017c1..f132f6de1 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -651,7 +651,7 @@ describe("quote.vue", () => {
         //Assert
         expect(wrapper.vm.isInsuranceSelected).toBe(false);
     });
-    test("should default to cash if offer = cash, despite all other checks pointing to insurance selection", async () => {
+    test("should default to cash if isCashSelected is true, despite all other checks pointing to insurance selection", async () => {
         // Also needs no query parameter or previous selection in store to be present
         //Arrange
 
@@ -695,7 +695,7 @@ describe("quote.vue", () => {
         //Act
         await quote.beforeRouteEnter.call(
             wrapper.vm,
-            { name: "quote", query: { isInsuranceSelected: true, offer: "cash" } },
+            { query: { fmgPage: "quote", isInsuranceSelected: true, isCashSelected: true } },
             undefined,
             (c) => c(wrapper.vm)
         );
diff --git a/src/layouts/return-user/return-user.spec.js b/src/layouts/return-user/return-user.spec.js
index b3d2924ca..dc631ce62 100644
--- a/src/layouts/return-user/return-user.spec.js
+++ b/src/layouts/return-user/return-user.spec.js
@@ -13,7 +13,7 @@ import router from "@/router";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
@@ -257,7 +257,7 @@ describe("return-user.vue", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                 navigationScenarios.CLICKED_FORWARD,
-                wrapper.vm.$route.name
+                wrapper.vm.$route
             );
         });
         test("expect functions in startOver to be called", async () => {
@@ -272,15 +272,18 @@ describe("return-user.vue", () => {
 
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
-                navigationScenarios.CLICKED_RESTART,
-                wrapper.vm.$route.name
+                navigationScenarios.CLICKED_FORWARD,
+                wrapper.vm.$route
             );
+
+            expect(dispatchStoreActionSpy).toHaveBeenCalledWith(storeActions.RESET_STATE);
+            expect(deleteFunnelCookie).toHaveBeenCalled();
         });
     });
 });
 
 function setupMocks({ customMountOptions }) {
-    const route = { name: "return-user" };
+    const route = { query: { fmgPage: "return-user" }, params: {} };
 
     baseMixin.methods.ResetExternalParamsAndHideModal = jest.fn();
 
@@ -291,7 +294,6 @@ function setupMocks({ customMountOptions }) {
 
     mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mocks["$router"] = router;
-    mountOptions.global.mocks.pageName = route.name;
     baseMixin.methods.isFormValid = jest.fn().mockReturnValue(true);
     mountOptions["attachTo"] = document.body;
 
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 91df48150..6b2a36f7e 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -91,7 +91,7 @@ export default {
 
         async startOver() {
             this.pushEventToGA(
-                this.pageName,
+                this.$route.query[this.queryStrings.FMG_PAGE],
                 this.GaActions.CLICKED,
                 "Start over",
                 true
diff --git a/src/layouts/schedule/schedule.spec.js b/src/layouts/schedule/schedule.spec.js
index 4b17224db..f3281d34e 100644
--- a/src/layouts/schedule/schedule.spec.js
+++ b/src/layouts/schedule/schedule.spec.js
@@ -463,13 +463,14 @@ describe("schedule.vue...", () => {
             expect(testOutput4).toBe("3:30 PM");
         });
 
-        test("Clicking back should fire correct navigation", () => {
+        test("getDisplayTextForMilitaryTime should return the correctly formatted string", () => {
             // Arrange
             const { wrapper } = setupMocks({});
             wrapper.vm.selectableDatesData = {
                 days: [],
             };
             wrapper.vm.$router.navigateWithoutSaving = jest.fn();
+            wrapper.vm.$route = "testRoute";
 
             // Act
             wrapper.vm.backButtonAction();
@@ -477,7 +478,7 @@ describe("schedule.vue...", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                 "CLICKED_BACK",
-                "schedule"
+                "testRoute"
             );
         });
     });
@@ -597,7 +598,6 @@ const mockCmsContent = {};
 function setupMocks({ customMountOptions }) {
     const mountOptions = getMountOptions({
         ...customMountOptions,
-        route: { name: "schedule" },
     });
 
     mountOptions.global.mocks["$store"] = store;
@@ -613,7 +613,6 @@ function setupMocks({ customMountOptions }) {
             },
         },
     ];
-    mountOptions.global.mocks.pageName = "schedule";
 
     const wrapper = shallowMount(schedule, mountOptions);
 
diff --git a/src/layouts/service-zip/service-zip.spec.js b/src/layouts/service-zip/service-zip.spec.js
index 77c584f7b..5a156422d 100644
--- a/src/layouts/service-zip/service-zip.spec.js
+++ b/src/layouts/service-zip/service-zip.spec.js
@@ -2,12 +2,12 @@
 import serviceZip from "@/layouts/service-zip/service-zip";
 
 // Supporting Files
-import { mount, shallowMount } from "@vue/test-utils";
+import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper";
 import baseMixin from "@/mixins/base-mixin";
 import store from "@/store";
 import router from "@/router";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { experimentSettings } from "../../constants/experiments";
@@ -251,6 +251,20 @@ describe("service-zip.vue", () => {
             expect(wrapper.vm.serviceZipCode).toEqual("11111");
             expect(wrapper.vm.emailOrSms).toEqual("builddigitaltest@safelite.com");
         });
+
+        test("Zip in querystring -> pushed to data", () => {
+            // Arrange
+            // no changes to store
+            applyMockStoreDataToGetters();
+
+            // Act
+            const wrapper = setupMocks({
+                customZipQuery: "11111",
+            });
+
+            // Assert
+            expect(wrapper.vm.serviceZipCode).toEqual("11111");
+        });
     });
 
     describe("Navigation", () => {
@@ -271,7 +285,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    wrapper.vm.$route.name
+                    wrapper.vm.$route
                 );
             });
 
@@ -287,7 +301,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_BACK,
-                    wrapper.vm.$route.name
+                    wrapper.vm.$route
                 );
             });
         });
@@ -312,7 +326,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    wrapper.vm.$route.name
+                    wrapper.vm.$route
                 );
                 expect(wrapper.vm.navigateForwardWithSingleCarMatch).not.toBeCalled();
             });
@@ -472,7 +486,7 @@ describe("service-zip.vue", () => {
 });
 
 function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse }) {
-    const route = { name: "service-zip" };
+    const route = { query: { fmgPage: "service-zip" }, params: {} };
     if (customZipQuery) {
         route.query.zipcode = customZipQuery;
     }
@@ -485,7 +499,6 @@ function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse
 
     mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mocks["$router"] = router;
-    mountOptions.global.mocks.pageName = route.name;
     mountOptions.mixins = [
         {
             methods: {
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index f6202337c..6a94c240b 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -16,6 +16,7 @@ import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { validate } from "vee-validate";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
+import { routerParams } from "@/router/router-constants/router-params";
 import * as cookieHelper from "@/helpers/heritage-integration/cookie-helper";
 
 // Mock our module for promises.
@@ -309,11 +310,11 @@ describe("vehicle-damage.vue", () => {
     describe("alert", () => {
         test("when displayVehicleChangeAlert router params is true, the alert: 'vehicleChangeAlert' should be rendered", () => {
             // Arrange & Act
+            window.history.pushState({ displayVehicleChangeAlert: "true" }, "", "");
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        name: "vehicle-damage",
-                        query: { displayVehicleChangeAlert: true },
+                        state: { displayVehicleChangeAlert: true },
                     },
                 },
             });
@@ -327,9 +328,8 @@ describe("vehicle-damage.vue", () => {
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        name: "vehicle-damage",
-                        query: {
-                            displayVehicleChangeAlert: false,
+                        state: {
+                            [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false,
                         },
                     },
                 },
@@ -345,9 +345,8 @@ describe("vehicle-damage.vue", () => {
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        name: "vehicle-damage",
-                        query: {
-                            displayVehicleChangeAlert: undefined,
+                        params: {
+                            [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: undefined,
                         },
                     },
                 },
@@ -853,8 +852,9 @@ function setupMocks({ pageHeaderWidgetHeaderText, mountOptionsMockData, funnelCo
             navigateWithSaving: jest.fn(),
         },
         route: {
-            name: "vehicle-damage",
-            query: {},
+            state: {
+                [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false,
+            },
         },
         store: {
             getters: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index 7dd082867..bef6aa032 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -12,7 +12,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 
 // Mock our module for promises.
 jest.mock("@/helpers/layout-helper.js", () => ({
@@ -84,10 +84,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: store.getters,
@@ -122,10 +123,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: store.getters,
@@ -159,10 +161,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: store.getters,
@@ -202,10 +205,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: {
@@ -251,7 +255,7 @@ describe("vehicle-parts.vue", () => {
         //Assert
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-            wrapper.vm.$route.name
+            wrapper.vm.$route
         );
     });
 
@@ -264,10 +268,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: {
@@ -297,7 +302,7 @@ describe("vehicle-parts.vue", () => {
         //Assert
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-            wrapper.vm.$route.name
+            wrapper.vm.$route
         );
     });
 
@@ -351,10 +356,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: store.getters,
@@ -378,7 +384,7 @@ describe("vehicle-parts.vue", () => {
         await wrapper.vm.forwardButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalled();
+        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
     });
 
     test("ForwardButtonAction triggers a router.navigateWithSaving change if there are capability questions", async () => {
@@ -411,10 +417,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: store.getters,
@@ -444,7 +451,7 @@ describe("vehicle-parts.vue", () => {
         await wrapper.vm.forwardButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalled();
+        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
     });
 
     test("ForwardButtonAction saves selected parts to store if no molding or capability questions", async () => {
@@ -461,10 +468,11 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
-                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    name: "vehicle-parts",
+                    query: {
+                        fmgPage: "vehicle-parts",
+                    },
                 },
                 store: {
                     getters: store.getters,
@@ -536,7 +544,6 @@ function setupMocks({ pageHeaderWidgetHeaderText = {}, mountOptionsMockData = {}
     wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
     wrapper.vm.$refs.navbar.removeLoader = jest.fn();
     wrapper.vm.$refs.loadingModal.showModal = jest.fn();
-    wrapper.vm.pageName = "vehicle-parts";
     // wrapper.vm.$refs.onSubmit = jest.fn();
     // wrapper.vm.$refs.onInvalidSubmit = jest.fn();
 
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index 9e6a5d7b5..aca9a8af5 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import vinLookup from "./vin-lookup.vue";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios.js";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
 import { settleAllPromises } from "@/helpers/layout-helper.js";
 import { experimentSettings } from "@/constants/experiments";
 
diff --git a/src/mixins/base-mixin.spec.js b/src/mixins/base-mixin.spec.js
index 2d95f95b3..2484c0871 100644
--- a/src/mixins/base-mixin.spec.js
+++ b/src/mixins/base-mixin.spec.js
@@ -1,7 +1,7 @@
 import baseMixin from "@/mixins/base-mixin";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
 import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 558adadd0..56f4425cc 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -1,11 +1,11 @@
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeMutations } from "@/constants/store-mutations";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
 import { getters } from "@/store";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
@@ -290,13 +290,13 @@ describe("vehicle-questions-mixin", () => {
 
     describe("currentPageComesBeforePage", () => {
         const testCases = [
-            [routeData.PART_QUESTIONS, routeData.VEHICLE_PARTS, true],
-            [routeData.VEHICLE_PARTS, routeData.VEHICLE_PARTS, false],
-            [routeData.QUOTE, routeData.VEHICLE_PARTS, false],
-            [routeData.QUOTE, routeData.QUOTE, false],
-            [routeData.VEHICLE_PARTS, routeData.PART_QUESTIONS, false],
-            [routeData.PART_QUESTIONS, routeData.CAPABILITY_QUESTIONS, true],
-            [routeData.MOLDING_QUESTIONS, routeData.CAPABILITY_QUESTIONS, true],
+            [fmgPageValues.PART_QUESTIONS, fmgPageValues.VEHICLE_PARTS, true],
+            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.VEHICLE_PARTS, false],
+            [fmgPageValues.QUOTE, fmgPageValues.VEHICLE_PARTS, false],
+            [fmgPageValues.QUOTE, fmgPageValues.QUOTE, false],
+            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.PART_QUESTIONS, false],
+            [fmgPageValues.PART_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, true],
+            [fmgPageValues.MOLDING_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, true],
         ];
         test.each(testCases)(
             "%s comes before %s is %s",
@@ -305,7 +305,7 @@ describe("vehicle-questions-mixin", () => {
                 const { wrapper } = setupMocks({});
 
                 // Act
-                const result = wrapper.vm.currentPageComesBeforePage(currentPage.name, nextPage.name);
+                const result = wrapper.vm.currentPageComesBeforePage(currentPage, nextPage);
 
                 // Assert
                 expect(result).toEqual(expectedResult);
@@ -315,20 +315,20 @@ describe("vehicle-questions-mixin", () => {
 
     describe("currentPageComesAfterPage", () => {
         const testCases = [
-            [routeData.PART_QUESTIONS, routeData.VEHICLE_PARTS, false],
-            [routeData.VEHICLE_PARTS, routeData.VEHICLE_PARTS, false],
-            [routeData.QUOTE, routeData.VEHICLE_PARTS, true],
-            [routeData.QUOTE, routeData.QUOTE, false],
-            [routeData.VEHICLE_PARTS, routeData.PART_QUESTIONS, true],
-            [routeData.PART_QUESTIONS, routeData.CAPABILITY_QUESTIONS, false],
-            [routeData.MOLDING_QUESTIONS, routeData.CAPABILITY_QUESTIONS, false],
+            [fmgPageValues.PART_QUESTIONS, fmgPageValues.VEHICLE_PARTS, false],
+            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.VEHICLE_PARTS, false],
+            [fmgPageValues.QUOTE, fmgPageValues.VEHICLE_PARTS, true],
+            [fmgPageValues.QUOTE, fmgPageValues.QUOTE, false],
+            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.PART_QUESTIONS, true],
+            [fmgPageValues.PART_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, false],
+            [fmgPageValues.MOLDING_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, false],
         ];
         test.each(testCases)("%s comes after %s is %s", (currentPage, nextPage, expectedResult) => {
             // Arrange
             const { wrapper } = setupMocks({});
 
             // Act
-            const result = wrapper.vm.currentPageComesAfterPage(currentPage.name, nextPage.name);
+            const result = wrapper.vm.currentPageComesAfterPage(currentPage, nextPage);
 
             // Assert
             expect(result).toEqual(expectedResult);
@@ -1321,10 +1321,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -1434,10 +1436,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -1539,10 +1543,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -1692,10 +1698,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -1738,10 +1746,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -1848,10 +1858,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -2024,10 +2036,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -2081,10 +2095,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -2121,10 +2137,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    wrapper.vm.$route.name,
+                    wrapper.vm.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             });
@@ -2297,7 +2315,7 @@ describe("vehicle-questions-mixin", () => {
 
         test("current page is quote, there are no questions, and we have their vin => go to vin-lookup", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name, hasVin: true });
+            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE, hasVin: true });
 
             // Act
             store.dispatch = jest.fn(() => {});
@@ -2306,13 +2324,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                routeData.QUOTE.name
+                { query: { fmgPage: fmgPageValues.QUOTE } }
             );
         });
 
         test("current page is quote and there are capability questions => go to capability questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name });
+            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE });
             wrapper.vm.hasCapabilityQuestions = jest.fn().mockReturnValue(true);
 
             // Act
@@ -2322,13 +2340,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                routeData.QUOTE.name
+                { query: { fmgPage: fmgPageValues.QUOTE } }
             );
         });
 
         test("current page is quote and there are part questions and molding questions => go to molding questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name });
+            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
 
@@ -2338,13 +2356,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                routeData.QUOTE.name
+                { query: { fmgPage: fmgPageValues.QUOTE } }
             );
         });
 
         test("current page is molding questions and there are part questions, multiple parts to choose, and capability questions => go to vehicle-parts", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: routeData.MOLDING_QUESTIONS.name });
+            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.MOLDING_QUESTIONS });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasGlassLocationWithMultipleParts = jest.fn().mockReturnValue(true);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
@@ -2357,13 +2375,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                routeData.MOLDING_QUESTIONS.name
+                { query: { fmgPage: fmgPageValues.MOLDING_QUESTIONS } }
             );
         });
 
         test("current page is molding questions and there are part questions and capability questions => go to part-questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: routeData.MOLDING_QUESTIONS.name });
+            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.MOLDING_QUESTIONS });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasGlassLocationWithMultipleParts = jest.fn().mockReturnValue(false);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
@@ -2376,13 +2394,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                routeData.MOLDING_QUESTIONS.name
+                { query: { fmgPage: fmgPageValues.MOLDING_QUESTIONS } }
             );
         });
     });
 });
 
-function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
+function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
     const baseMixin = setupMocksForJsFiles({
         actionList: [
             {
@@ -2405,7 +2423,6 @@ function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
-            navigateWithPageData: jest.fn(),
         },
         store: {
             commit: jest.fn(),
@@ -2419,7 +2436,9 @@ function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
             },
         },
         route: {
-            name: fmgPage
+            query: {
+                fmgPage,
+            },
         },
     });
 
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index d9ff6f874..ce9c267f9 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -58,9 +58,6 @@ function setupMocks({ partsOrQuestions = [] }) {
                 },
             },
         },
-        route: {
-            name: "vin-lookup",
-        },
     });
 
     const mockVinComponent = {
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 68c8f6761..69e2feb66 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -3,7 +3,7 @@ import { mutations, state, actions, getters } from "@/store";
 import { storeMutations } from "@/constants/store-mutations";
 import { storeActions } from "@/constants/store-actions";
 import { experimentTriggers } from "@/constants/experiments";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 
 // Mock global method
@@ -1862,15 +1862,15 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.VEHICLE_PARTS.name,
+                    page: fmgPageValues.VEHICLE_PARTS,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: null,
                 });
             } else {
@@ -1884,15 +1884,15 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.VEHICLE_PARTS.name,
+                    page: fmgPageValues.VEHICLE_PARTS,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: null,
                 });
             }
@@ -2040,11 +2040,11 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: null,
                 });
             } else {
@@ -2058,11 +2058,11 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: null,
                 });
             }
@@ -2085,12 +2085,12 @@ describe("Actions", () => {
             ];
 
             mutations.updatePageData(context, {
-                page: routeData.MOLDING_QUESTIONS.name,
+                page: fmgPageValues.MOLDING_QUESTIONS,
                 data: previouslySelectedParts,
             });
 
             mutations.updatePageData(context, {
-                page: routeData.CAPABILITY_QUESTIONS.name,
+                page: fmgPageValues.CAPABILITY_QUESTIONS,
                 data: previouslySelectedParts,
             });
 
@@ -2134,7 +2134,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2187,7 +2187,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2232,7 +2232,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2285,7 +2285,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2330,7 +2330,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2383,7 +2383,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2428,7 +2428,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.MOLDING_QUESTIONS.name,
+                    page: fmgPageValues.MOLDING_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2481,7 +2481,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: previouslySelectedParts,
                 });
 
@@ -2522,7 +2522,7 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: null,
                 });
             } else {
@@ -2532,7 +2532,7 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: routeData.CAPABILITY_QUESTIONS.name,
+                    page: fmgPageValues.CAPABILITY_QUESTIONS,
                     data: null,
                 });
             }

From 7b73313513094ff5921570fc14d5106198db0aa7 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:35:48 -0400
Subject: [PATCH 46/64] Revert "Unplug Legacy Router"

This reverts commit 572f8de5bb8298225ff79e4212406e3297017216.
---
 src/constants/application-config.js           |   1 -
 src/digital-components/modal/modal.vue        |   8 +-
 src/fmg-components/nav-bar/nav-bar.vue        |   9 +-
 src/global-methods.js                         |   2 +-
 .../heritage-integration/navigation-helper.js | 102 ++
 src/helpers/unit-test-helper.js               |   6 +-
 src/layouts/address-lookup/address-lookup.vue |   5 +-
 .../address-vehicles/address-vehicles.vue     |   7 +-
 .../capability-questions.vue                  |   6 +-
 src/layouts/estimate/estimate.vue             |   2 +-
 .../license-plate-lookup.vue                  |   7 +-
 .../molding-questions/molding-questions.vue   |   6 +-
 src/layouts/part-questions/part-questions.vue |   6 +-
 src/layouts/payment-method/payment-method.vue |   3 +-
 .../payment-pia-return/payment-pia-return.vue |   1 +
 src/layouts/payment/payment.vue               |   8 +-
 src/layouts/quote/quote.vue                   |   8 +-
 src/layouts/service-zip/service-zip.vue       |   6 +-
 src/layouts/vehicle-damage/vehicle-damage.vue |   1 +
 src/layouts/vehicle-parts/vehicle-parts.vue   |   6 +-
 src/layouts/vehicle/vehicle.vue               |   2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |   9 +-
 src/main.js                                   |   2 +-
 src/mixins/analytics-mixin.js                 |   5 +-
 src/mixins/base-mixin.js                      |   6 +-
 src/mixins/vehicle-questions-mixin.js         |  38 +-
 .../constants/auto-route-table.js             |   0
 .../constants/externalUrl-values.js           |   0
 .../constants/navigation-scenarios.js         |   0
 .../{ => a-rewrite}/constants/route-prefix.js |   0
 .../{ => a-rewrite}/constants/routes.js       |   0
 .../constants/routing-table.js                |   6 +-
 src/router/a-rewrite/index.js                 |  38 +
 .../{ => a-rewrite}/methods/after-each.js     |   0
 .../{ => a-rewrite}/methods/before-each.js    |  10 +-
 src/router/{ => a-rewrite}/methods/error.js   |   4 +-
 .../{ => a-rewrite}/methods/get-route.js      |   2 +-
 .../methods/helpers/build-manual-url.js       |   2 +-
 .../methods/helpers/consume-referral-info.js  |   0
 .../methods/helpers/create-route.js           |   4 +-
 .../methods/helpers/get-destination.js        |   2 +-
 .../helpers/initialize-from-querystrings.js   |   0
 .../methods/helpers/lazy-load-component.js    |   0
 .../methods/helpers/querystring-stash.js      |   0
 .../helpers/requires-verified-redirect.js     |   0
 .../methods/helpers/run-experiments.js        |   0
 .../methods/helpers/save-page-data.js         |   0
 .../methods/navigate-external.js              |   0
 .../{ => a-rewrite}/methods/navigate.js       |  16 +-
 .../methods/page-prerequisites.js             |   2 +-
 .../methods/route-logic/auto-route.js         |   6 +-
 .../methods/route-logic/error.js              |   4 +-
 .../methods/route-logic/heritage.js           |   0
 .../methods/route-logic/insurance-company.js  |   4 +-
 .../methods/route-logic/landing.js            |  10 +-
 .../methods/route-logic/load-session.js       |   2 +-
 .../methods/route-logic/quote.js              |   4 +-
 .../methods/route-logic/restart.js            |   4 +-
 .../methods/route-logic/vehicle.js            |   4 +-
 src/router/{ => a-rewrite}/methods/routes.js  |  22 +-
 .../dynamic-routing/component-loader.js       |   3 +
 src/router/index.js                           | 947 +++++++++++++++++-
 src/router/methods/send-to-return-user.js     |  11 -
 .../router-constants/externalUrl-values.js    |   6 +
 src/router/router-constants/fmgPage-values.js |  32 +
 .../router-constants/navigation-scenarios.js  |  59 ++
 src/router/router-constants/router-params.js  |   6 +
 src/router/router-constants/routing-table.js  | 546 ++++++++++
 src/store/index.js                            |  38 +-
 69 files changed, 1885 insertions(+), 171 deletions(-)
 rename src/router/{ => a-rewrite}/constants/auto-route-table.js (100%)
 rename src/router/{ => a-rewrite}/constants/externalUrl-values.js (100%)
 rename src/router/{ => a-rewrite}/constants/navigation-scenarios.js (100%)
 rename src/router/{ => a-rewrite}/constants/route-prefix.js (100%)
 rename src/router/{ => a-rewrite}/constants/routes.js (100%)
 rename src/router/{ => a-rewrite}/constants/routing-table.js (99%)
 create mode 100644 src/router/a-rewrite/index.js
 rename src/router/{ => a-rewrite}/methods/after-each.js (100%)
 rename src/router/{ => a-rewrite}/methods/before-each.js (86%)
 rename src/router/{ => a-rewrite}/methods/error.js (78%)
 rename src/router/{ => a-rewrite}/methods/get-route.js (71%)
 rename src/router/{ => a-rewrite}/methods/helpers/build-manual-url.js (88%)
 rename src/router/{ => a-rewrite}/methods/helpers/consume-referral-info.js (100%)
 rename src/router/{ => a-rewrite}/methods/helpers/create-route.js (87%)
 rename src/router/{ => a-rewrite}/methods/helpers/get-destination.js (85%)
 rename src/router/{ => a-rewrite}/methods/helpers/initialize-from-querystrings.js (100%)
 rename src/router/{ => a-rewrite}/methods/helpers/lazy-load-component.js (100%)
 rename src/router/{ => a-rewrite}/methods/helpers/querystring-stash.js (100%)
 rename src/router/{ => a-rewrite}/methods/helpers/requires-verified-redirect.js (100%)
 rename src/router/{ => a-rewrite}/methods/helpers/run-experiments.js (100%)
 rename src/router/{ => a-rewrite}/methods/helpers/save-page-data.js (100%)
 rename src/router/{ => a-rewrite}/methods/navigate-external.js (100%)
 rename src/router/{ => a-rewrite}/methods/navigate.js (79%)
 rename src/router/{ => a-rewrite}/methods/page-prerequisites.js (87%)
 rename src/router/{ => a-rewrite}/methods/route-logic/auto-route.js (65%)
 rename src/router/{ => a-rewrite}/methods/route-logic/error.js (92%)
 rename src/router/{ => a-rewrite}/methods/route-logic/heritage.js (100%)
 rename src/router/{ => a-rewrite}/methods/route-logic/insurance-company.js (54%)
 rename src/router/{ => a-rewrite}/methods/route-logic/landing.js (69%)
 rename src/router/{ => a-rewrite}/methods/route-logic/load-session.js (82%)
 rename src/router/{ => a-rewrite}/methods/route-logic/quote.js (75%)
 rename src/router/{ => a-rewrite}/methods/route-logic/restart.js (84%)
 rename src/router/{ => a-rewrite}/methods/route-logic/vehicle.js (81%)
 rename src/router/{ => a-rewrite}/methods/routes.js (60%)
 create mode 100644 src/router/dynamic-routing/component-loader.js
 delete mode 100644 src/router/methods/send-to-return-user.js
 create mode 100644 src/router/router-constants/externalUrl-values.js
 create mode 100644 src/router/router-constants/fmgPage-values.js
 create mode 100644 src/router/router-constants/navigation-scenarios.js
 create mode 100644 src/router/router-constants/router-params.js
 create mode 100644 src/router/router-constants/routing-table.js

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 788de3fd7..a03e5f010 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -6,7 +6,6 @@ const applicationConfig = {
     COOKIE_PATH: "/",
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
-    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
     APPLICATION_NAME: "FixMyGlass",
     ANALYTICS_APPLICATION_NAME: "FixMyGlassNextGen",
     APPLICATION_ABBREVIATION: "fmg",
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 4cc75f701..7b89b7e57 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -46,7 +46,9 @@
 </template>
 
 <script>
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router/index.js";
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
@@ -89,7 +91,11 @@ export default {
             const validationResult = await this.validate();
             if (validationResult.valid) {
                 if (analyticsMixin.methods.sessionExpired()) {
-                    this.$router.sendToReturnUser();
+                    analyticsMixin.methods.initSession();
+                    router.push({
+                        path: "/",
+                        query: { fmgPage: fmgPageValues.RETURN_USER },
+                    });
                 } else {
                     this.$emit("footer-button-event");
                 }
diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index aed1edb19..eaf37047c 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -45,7 +45,9 @@
 <script>
 import textLink from "@/ux-components/text-link/text-link";
 import buttonMain from "@/ux-components/button-main/button-main";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router/index.js";
 
 export default {
     name: "navbar",
@@ -111,7 +113,12 @@ export default {
             }
         },
         routeReturnUser() {
-            this.$router.sendToReturnUser();
+            analyticsMixin.methods.initSession();
+
+            router.push({
+                path: "/",
+                query: { fmgPage: fmgPageValues.RETURN_USER },
+            });
         },
     },
 };
diff --git a/src/global-methods.js b/src/global-methods.js
index e90843bdc..784ba6782 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import router from "@/router";
+import router from "@/router/a-rewrite";
 import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index ca547b980..2fc557a16 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -1,7 +1,11 @@
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { externalUrls } from "@/router/router-constants/externalUrl-values";
+import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeActions } from "@/constants/store-actions.js";
+import { settleAllPromises } from "@/helpers/layout-helper";
 import experimentMixin from "@/mixins/experiment-mixin";
 import { experimentSettings } from "@/constants/experiments";
 import { includesWindshieldReplacement } from "@/helpers/damage-helper";
@@ -9,9 +13,103 @@ import { applicationConfig } from "@/constants/application-config.js";
 import store from "@/store";
 import router from "@/router";
 
+export async function getPageToRouteExistingOrderTo(toRoute = {}) {
+    const fmgQueryPage = toRoute.query[queryStrings.FMG_PAGE];
+    const hasFmgQueryPage = !!fmgQueryPage;
+
+    if (hasFmgQueryPage) {
+        return await getDirectNavigation(toRoute);
+    } else {
+        return await getImplicitNavigation(toRoute);
+    }
+}
+
+/*
+ * Send the user to the specified page, except in specific scenarios.
+ */
+export async function getDirectNavigation(toRoute) {
+    const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE];
+
+    // Verified insurance users need to be routed around some pages.  Same goes for C&C unverified 6 digit referrals
+    // vehicle -> vehicle-damage
+    // quote -> vin-lookup/estimate
+    // insurance-company -> vin-lookup/estimate
+    if (
+        store.getters.payment?.insuranceCoverage?.isVerified ||
+        store.getters.order?.referralNumber?.length === 6
+    ) {
+        if (fmgPageValue === fmgPageValues.VEHICLE) {
+            return fmgPageValues.VEHICLE_DAMAGE;
+        }
+
+        if (fmgPageValue === fmgPageValues.QUOTE) {
+            const skipVin = await skipVinLookup();
+
+            if (skipVin || !store.getters.vehicle?.vin) {
+                return fmgPageValues.ESTIMATE;
+            } else {
+                return fmgPageValues.VIN_LOOKUP;
+            }
+        }
+    }
+
+    // Otherwise, respect navigation from query string.
+    return fmgPageValue;
+}
+
+/*
+ * Determine which page in the flow the user should be sent to, based on their current order.
+ * General strategy: run through pages in reverse order, and select first where prerequisites are valid.
+ * QUOTE is the latest page to send to.
+ */
+export async function getImplicitNavigation(toRoute) {
+    const vehicleDamageComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_DAMAGE);
+    const estimateComponent = await getLazyLoadedComponent(fmgPageValues.ESTIMATE);
+    const vinLookupComponent = await getLazyLoadedComponent(fmgPageValues.VIN_LOOKUP);
+    const partQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.PART_QUESTIONS);
+    const vehiclePartsComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_PARTS);
+    const moldingQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.MOLDING_QUESTIONS);
+    const capabilityQuestionsComponent = await getLazyLoadedComponent(
+        fmgPageValues.CAPABILITY_QUESTIONS
+    );
+    const quoteComponent = await getLazyLoadedComponent(fmgPageValues.QUOTE);
+
+    const skipVin = await skipVinLookup();
+
+    if (store.getters.order.payment.insuranceCoverage?.isVerified) {
+        return fmgPageValues.HERITAGE;
+    }
+
+    if (quoteComponent.methods.arePagePrerequisitesValid()) {
+        // Do not send to quote if verified insurance user.
+        if (store.getters.requiresVerifiedRedirecting) {
+            return fmgPageValues.HERITAGE;
+        } else {
+            return fmgPageValues.QUOTE;
+        }
+    } else if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
+        return fmgPageValues.CAPABILITY_QUESTIONS;
+    } else if (moldingQuestionsComponent.methods.arePagePrerequisitesValid()) {
+        return fmgPageValues.MOLDING_QUESTIONS;
+    } else if (vehiclePartsComponent.methods.arePagePrerequisitesValid()) {
+        return fmgPageValues.VEHICLE_PARTS;
+    } else if (partQuestionsComponent.methods.arePagePrerequisitesValid()) {
+        return fmgPageValues.PART_QUESTIONS;
+    } else if (vinLookupComponent.methods.arePagePrerequisitesValid() && !skipVin) {
+        return fmgPageValues.VIN_LOOKUP;
+    } else if (estimateComponent.methods.arePagePrerequisitesValid()) {
+        return fmgPageValues.ESTIMATE;
+    } else if (vehicleDamageComponent.methods.arePagePrerequisitesValid()) {
+        return fmgPageValues.VEHICLE_DAMAGE;
+    } else {
+        return fmgPageValues.VEHICLE;
+    }
+}
+
 /*
     Used to navigate to the heritage funnel with the correct query string and url.
 */
+
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
     const log = getQuerystringParameter(queryStrings.LOG);
     if (log === "true") {
@@ -93,3 +191,7 @@ export async function skipVinLookupNotRepair() {
         experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
     );
 }
+
+async function getLazyLoadedComponent(pageName) {
+    return (await lazyLoadComponent(pageName)()).default;
+}
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 540f607b0..7c3c9ed4e 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -1,7 +1,8 @@
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios.js";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin";
@@ -18,6 +19,7 @@ import {
     ValueToLogTypes,
 } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
+import { routerParams } from "@/router/router-constants/router-params";
 
 // Common methods
 export function getMountOptions(mockData) {
@@ -58,6 +60,7 @@ export function getMountOptions(mockData) {
     mocks.storeMutations = storeMutations;
     mocks.navigationScenarios = navigationScenarios;
     mocks.vehicleCategories = vehicleCategories;
+    mocks.fmgPageValues = fmgPageValues;
     mocks.analyticsPageEvents = analyticsPageEvents;
     mocks.GaCategories = GaCategories;
     mocks.GaActions = GaActions;
@@ -65,6 +68,7 @@ export function getMountOptions(mockData) {
     mocks.GaEvents = GaEvents;
     mocks.ValueToLogTypes = ValueToLogTypes;
     mocks.queryStrings = queryStrings;
+    mocks.routerParams = routerParams;
 
     // Mock $store and $router when accessing this.$store/$router
     mocks.$store = mockData.store;
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 91aed6f1a..6a82ea26c 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -118,11 +118,12 @@ import { errorMessages } from "@/constants/error-messages";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
+import { routerParams } from "@/router/router-constants/router-params";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 
 // DEFINE VALIDATION RULES - Note: Additional rules are defined in Customer Questions and Address Questions components
 defineRule("service-zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -411,7 +412,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: routeData.SERVICE_ZIP.name,
+                    page: fmgPageValues.EMAIL_SMS_PAGES,
                     data: { emailOrSmsValue: this.customerQuestions.emailOrSms },
                 },
                 false
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index baffb70a6..e094f6147 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -60,7 +60,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { errorMessages } from "@/constants/error-messages";
 import { required } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
@@ -71,6 +71,7 @@ import {
     getRouterLinkRouteFromCopy,
     getRouterLinkDisplayTextFromCopy,
 } from "@/helpers/cms-content-helper";
+import { routerParams } from "@/router/router-constants/router-params";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 
 // DEFINE VALIDATION RULES
@@ -143,7 +144,7 @@ export default {
             return mappedData;
         },
         VehiclesFromApi() {
-            return store.getters.pageData(routeData.ADDRESS_VEHICLES.name);
+            return store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES);
         },
         selectedVehicle() {
             return this.VehiclesForQuestions.find(({ vin }) => vin === this.selectedVehicleVin);
@@ -158,7 +159,7 @@ export default {
             if (
                 store.getters.order.vehicle.carId &&
                 store.getters.order.serviceLocation.zipCode &&
-                store.getters.pageData(routeData.ADDRESS_VEHICLES.name)
+                store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES)
             ) {
                 return true;
             }
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index c4f5df92c..e04f0f18e 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -97,7 +97,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)
+            return this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)
                 .partsOrQuestions;
         },
     },
@@ -107,7 +107,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const capabilityQuestionsPageData = store.getters.pageData(
-                routeData.CAPABILITY_QUESTIONS.name
+                fmgPageValues.CAPABILITY_QUESTIONS
             );
             return (
                 // has capabilityQuestions array and has glassName not null
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 811cd1a86..66d1544d9 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index cab786b4a..673116965 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -112,13 +112,14 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
 import { errorMessages } from "@/constants/error-messages";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
+import { routerParams } from "@/router/router-constants/router-params";
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { routeData } from "@/router/constants/routes";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -366,7 +367,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: routeData.SERVICE_ZIP.name,
+                    page: fmgPageValues.EMAIL_SMS_PAGES,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index a7f4900de..82b1e1619 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -112,7 +112,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(routeData.MOLDING_QUESTIONS.name).partsOrQuestions;
+            return this.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS).partsOrQuestions;
         },
     },
     mounted() {
@@ -121,7 +121,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const moldingQuestionsFromPageData = store.getters.pageData(
-                routeData.MOLDING_QUESTIONS.name
+                fmgPageValues.MOLDING_QUESTIONS
             );
             return (
                 // has childPartQuestions array and has glassName not null
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 5456d868f..89568fa37 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -114,7 +114,7 @@ export default {
             return this.getCmsContent("AlertPartsQuestions", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(routeData.PART_QUESTIONS.name).partsOrQuestions;
+            return this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS).partsOrQuestions;
         },
     },
     mounted() {
@@ -122,7 +122,7 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            const partQuestionsFromPageData = store.getters.pageData(routeData.PART_QUESTIONS.name);
+            const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
             return (
                 // has .partQuestions array and has glassName not null
                 partQuestionsFromPageData?.partsOrQuestions?.some((part) => part?.glassName) &&
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index e2debfe4a..51a3ffd5d 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -147,6 +147,7 @@ import {
     getNewlyInactivatedPromos,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
+import { routerParams } from "@/router/router-constants/router-params";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 
@@ -167,7 +168,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index b1ec2b120..b39726948 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -13,6 +13,7 @@ import store from "@/store";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form } from "vee-validate";
 import { paymentMethods } from "@/constants/payment-method-constants";
+import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import {
     getDisplayAmountDue,
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 40d772dbb..f2bdb6733 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -213,6 +213,7 @@ import alert from "@/ux-components/alert/alert";
 
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
+import { externalUrls } from "@/router/router-constants/externalUrl-values";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { applicationConfig } from "@/constants/application-config";
@@ -230,6 +231,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import iframeResize from "../../../node_modules/iframe-resizer/js/iframeResizer.js";
+import { routerParams } from "@/router/router-constants/router-params";
 import { coverageStatus } from "@/constants/insurance";
 import { getBoolFromString } from "@/helpers/boolean-helper.js";
 import {
@@ -243,7 +245,7 @@ export default {
     name: "payment",
     data() {
         return {
-            checkoutUrl: applicationConfig.SAFELITE_HOP,
+            checkoutUrl: externalUrls.SAFELITE_HOP,
             piaResponseUrl: applicationConfig.PIA_RESPONSE_URL,
             piaCancelUrl: applicationConfig.PIA_CANCEL_URL,
             piaErrorUrl: applicationConfig.PIA_ERROR_URL,
@@ -691,7 +693,9 @@ export default {
                 console.log("error: response from submit work order(payment pg):" + error.message);
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName
+                    this.pageName,
+                    {},
+                    { [routerParams.DISPLAY_PIA_ALERT]: true }
                 );
                 this.$refs.loadingModal.isModalVisible = false;
                 return;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index a31719dbd..c095d00be 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -168,8 +168,8 @@ import {
     getDeviceIdValue,
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
-import { routeData } from "@/router/constants/routes";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
@@ -283,7 +283,7 @@ export default {
         const emailFromStore = store.getters.order.customer.emailAddress;
         const isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
         const isPopupSkipped =
-            store.getters.pageData(routeData.QUOTE.name)?.saveProgressPopupSkipped === true;
+            store.getters.pageData(fmgPageValues.QUOTE)?.saveProgressPopupSkipped === true;
         const showSaveProgressPopup = !(isEmailInStoreOnPageLoad || isPopupSkipped);
         const showSaveProgressModal = isEmailInStoreOnPageLoad ? false : true;
         const shouldSkipToInsurance =
@@ -685,7 +685,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: routeData.QUOTE.name,
+                    page: fmgPageValues.QUOTE,
                     data: { saveProgressPopupSkipped: true },
                 },
                 false
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 819fa4273..6e0bccda6 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -95,8 +95,8 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
-import { routeData } from "@/router/constants/routes";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -243,7 +243,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: routeData.SERVICE_ZIP.name,
+                    page: fmgPageValues.EMAIL_SMS_PAGES,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 1106f7324..488ad1eb4 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -97,6 +97,7 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsCms } from "@/constants/damage-locations-cms.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { routerParams } from "@/router/router-constants/router-params";
 
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index fcea707eb..4298b74cb 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -69,7 +69,7 @@ import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-ques
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { Form } from "vee-validate";
 import store from "@/store";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
@@ -162,7 +162,7 @@ export default {
         },
 
         PartsFromApi() {
-            return this.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
+            return this.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
         },
 
         RefPrefix() {
@@ -172,7 +172,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
-            const vehiclePartsFromPageData = store.getters.pageData(routeData.VEHICLE_PARTS.name);
+            const vehiclePartsFromPageData = store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
             return (
                 store.getters.damage.isRepair != null &&
                 vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 174c76530..8686be85b 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -113,7 +113,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import {
     consumeQueryFromStash,
     peekQueryFromStash,
-} from "@/router/methods/helpers/querystring-stash";
+} from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 05f6fdbd7..277e176f5 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -155,11 +155,12 @@ import {
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { routeData } from "@/router/constants/routes";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -390,7 +391,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: routeData.SERVICE_ZIP.name,
+                        page: fmgPageValues.EMAIL_SMS_PAGES,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
@@ -453,7 +454,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: routeData.SERVICE_ZIP.name,
+                        page: fmgPageValues.EMAIL_SMS_PAGES,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
diff --git a/src/main.js b/src/main.js
index 5d655db85..5b823125b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import LoadScript from "vue-plugin-load-script";
 import Maska from "maska";
 import App from "./App.vue";
-import router from "@/router";
+import router from "./router/a-rewrite";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 import analyticsMixin from "@/mixins/analytics-mixin.js";
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 05baa9b0b..b1df7156c 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -27,7 +27,8 @@ import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { applicationConfig } from "../constants/application-config";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import router from "@/router/index.js";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { Variables } from "../constants/analytics";
 
@@ -44,7 +45,7 @@ export default {
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
             const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
             const hasSubmittedOrderAtConfirmationPage =
-                hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name;
+                hasSubmittedOrder && currentPageName?.toLowerCase() == fmgPageValues.CONFIRMATION;
 
             const refSequenceNum = hasSubmittedOrderAtConfirmationPage
                 ? submittedOrder.referralSequenceNumber
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 3dfca7dbf..e39908a8f 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -2,8 +2,9 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
+import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
@@ -234,6 +235,9 @@ export default {
         vehicleCategories() {
             return vehicleCategories;
         },
+        routerParams() {
+            return routerParams;
+        },
         queryStrings() {
             return queryStrings;
         },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index c8d6a554f..ab39462ce 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,6 +1,6 @@
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
 import { storeActions } from "@/constants/store-actions";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -53,11 +53,11 @@ export default {
         },
         comparePageIndices(currentPage, fmgPage) {
             const orderedVehicleQuestionPages = [
-                routeData.PART_QUESTIONS.name,
-                routeData.VEHICLE_PARTS.name,
-                routeData.MOLDING_QUESTIONS.name,
-                routeData.CAPABILITY_QUESTIONS.name,
-                routeData.QUOTE.name,
+                fmgPageValues.PART_QUESTIONS,
+                fmgPageValues.VEHICLE_PARTS,
+                fmgPageValues.MOLDING_QUESTIONS,
+                fmgPageValues.CAPABILITY_QUESTIONS,
+                fmgPageValues.QUOTE,
             ];
 
             return (
@@ -369,7 +369,7 @@ export default {
 
             if (
                 hasPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, routeData.PART_QUESTIONS.name)
+                this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)
             ) {
                 self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
@@ -378,7 +378,7 @@ export default {
                 );
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesBeforePage(currentPage, routeData.VEHICLE_PARTS.name)
+                this.currentPageComesBeforePage(currentPage, fmgPageValues.VEHICLE_PARTS)
             ) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData
@@ -389,7 +389,7 @@ export default {
                 );
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, routeData.MOLDING_QUESTIONS.name)
+                this.currentPageComesBeforePage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
             ) {
                 // if any childpart questions
                 // go to molding-questions page and pass the partsData
@@ -400,7 +400,7 @@ export default {
                 );
             } else if (
                 hasCapabilityQuestions &&
-                this.currentPageComesBeforePage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
+                this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
             ) {
                 // if has capability questions
                 // go to capability-questions page and pass the partsData
@@ -479,14 +479,14 @@ export default {
             const self = vm ?? this;
             const currentPage = self.pageName;
             const pageDataCapabilityQuestions = self.$store.getters.pageData(
-                routeData.CAPABILITY_QUESTIONS.name
+                fmgPageValues.CAPABILITY_QUESTIONS
             );
             const pageDataMoldingQuestions = self.$store.getters.pageData(
-                routeData.MOLDING_QUESTIONS.name
+                fmgPageValues.MOLDING_QUESTIONS
             );
-            const pageDataVehicleParts = self.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
+            const pageDataVehicleParts = self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
             const pageDataPartQuestions = self.$store.getters.pageData(
-                routeData.PART_QUESTIONS.name
+                fmgPageValues.PART_QUESTIONS
             );
 
             const allPartsOrQuestions = [
@@ -510,23 +510,23 @@ export default {
 
             if (
                 hasCapabilityQuestions &&
-                this.currentPageComesAfterPage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS;
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, routeData.MOLDING_QUESTIONS.name)
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS;
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesAfterPage(currentPage, routeData.VEHICLE_PARTS.name)
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS)
             ) {
                 backNavigationScenario =
                     navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE;
             } else if (
                 hasPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, routeData.PART_QUESTIONS.name)
+                this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
diff --git a/src/router/constants/auto-route-table.js b/src/router/a-rewrite/constants/auto-route-table.js
similarity index 100%
rename from src/router/constants/auto-route-table.js
rename to src/router/a-rewrite/constants/auto-route-table.js
diff --git a/src/router/constants/externalUrl-values.js b/src/router/a-rewrite/constants/externalUrl-values.js
similarity index 100%
rename from src/router/constants/externalUrl-values.js
rename to src/router/a-rewrite/constants/externalUrl-values.js
diff --git a/src/router/constants/navigation-scenarios.js b/src/router/a-rewrite/constants/navigation-scenarios.js
similarity index 100%
rename from src/router/constants/navigation-scenarios.js
rename to src/router/a-rewrite/constants/navigation-scenarios.js
diff --git a/src/router/constants/route-prefix.js b/src/router/a-rewrite/constants/route-prefix.js
similarity index 100%
rename from src/router/constants/route-prefix.js
rename to src/router/a-rewrite/constants/route-prefix.js
diff --git a/src/router/constants/routes.js b/src/router/a-rewrite/constants/routes.js
similarity index 100%
rename from src/router/constants/routes.js
rename to src/router/a-rewrite/constants/routes.js
diff --git a/src/router/constants/routing-table.js b/src/router/a-rewrite/constants/routing-table.js
similarity index 99%
rename from src/router/constants/routing-table.js
rename to src/router/a-rewrite/constants/routing-table.js
index 4b7286741..10ee7ae90 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/a-rewrite/constants/routing-table.js
@@ -1,7 +1,7 @@
-import { routeData } from "@/router/constants/routes";
-import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
 import store from "@/store";
-import { paymentMethods } from "@/constants/payment-method-constants";
+import { paymentMethods } from "../../../constants/payment-method-constants";
 
 // Get as function to live-evaluate filters
 const routingTable = function () {
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
new file mode 100644
index 000000000..37bd5aa0d
--- /dev/null
+++ b/src/router/a-rewrite/index.js
@@ -0,0 +1,38 @@
+import { routes } from "@/router/a-rewrite/methods/routes";
+import { afterEach } from "@/router/a-rewrite/methods/after-each";
+import { beforeEach } from "@/router/a-rewrite/methods/before-each";
+import { bailout } from "@/router/a-rewrite/methods/error";
+import {
+    navigateWithoutSaving,
+    navigateWithSaving,
+    navigateWithPageData,
+    navigateAndForceTopLevelNavigation,
+} from "@/router/a-rewrite/methods/navigate";
+import { navigateToExternalUrl } from "@/router/a-rewrite/methods/navigate-external";
+import { createWebHistory, createRouter } from "vue-router";
+import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
+
+const router = createRouter({
+    history: createWebHistory(ROUTE_PREFIX_FULL),
+    routes,
+    // Scroll to top on navigation.
+    scrollBehavior(to, from, savedPosition) {
+        return { top: 0 };
+    },
+});
+
+// Set guards
+router.afterEach(async (to, from) => afterEach(to, from));
+router.beforeEach(async (to, from) => beforeEach(to, from));
+
+// Bind methods for external use
+router.navigateWithSaving = navigateWithSaving;
+router.navigateWithoutSaving = navigateWithoutSaving;
+router.navigateWithPageData = navigateWithPageData;
+router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
+
+router.bailout = bailout;
+
+router.navigateToExternalUrl = navigateToExternalUrl;
+
+export default router;
diff --git a/src/router/methods/after-each.js b/src/router/a-rewrite/methods/after-each.js
similarity index 100%
rename from src/router/methods/after-each.js
rename to src/router/a-rewrite/methods/after-each.js
diff --git a/src/router/methods/before-each.js b/src/router/a-rewrite/methods/before-each.js
similarity index 86%
rename from src/router/methods/before-each.js
rename to src/router/a-rewrite/methods/before-each.js
index dae53b583..05264ed3c 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/a-rewrite/methods/before-each.js
@@ -7,12 +7,12 @@ import {
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
-import { runExperiments } from "@/router/methods/helpers/run-experiments";
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { runExperiments } from "@/router/a-rewrite/methods/helpers/run-experiments";
 
-import { bailout } from "@/router/methods/error";
-import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
+import { bailout } from "@/router/a-rewrite/methods/error";
+import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
 
 export async function beforeEach(to, from) {
     try {
diff --git a/src/router/methods/error.js b/src/router/a-rewrite/methods/error.js
similarity index 78%
rename from src/router/methods/error.js
rename to src/router/a-rewrite/methods/error.js
index f9f20c19d..3c50c1768 100644
--- a/src/router/methods/error.js
+++ b/src/router/a-rewrite/methods/error.js
@@ -1,6 +1,6 @@
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData } from "@/router/constants/routes";
-import router from "@/router";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import router from "@/router/a-rewrite";
 
 export async function bailout(errorPayload, forceRestart = false) {
     analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
diff --git a/src/router/methods/get-route.js b/src/router/a-rewrite/methods/get-route.js
similarity index 71%
rename from src/router/methods/get-route.js
rename to src/router/a-rewrite/methods/get-route.js
index 9c6e84c0c..ead89eb5b 100644
--- a/src/router/methods/get-route.js
+++ b/src/router/a-rewrite/methods/get-route.js
@@ -1,4 +1,4 @@
-import router from "@/router";
+import router from "@/router/a-rewrite";
 
 export function getRoute(pageName) {
     return router.getRoutes().find((r) => r.name === pageName);
diff --git a/src/router/methods/helpers/build-manual-url.js b/src/router/a-rewrite/methods/helpers/build-manual-url.js
similarity index 88%
rename from src/router/methods/helpers/build-manual-url.js
rename to src/router/a-rewrite/methods/helpers/build-manual-url.js
index a1638601b..260b41257 100644
--- a/src/router/methods/helpers/build-manual-url.js
+++ b/src/router/a-rewrite/methods/helpers/build-manual-url.js
@@ -1,4 +1,4 @@
-import { ROUTE_PREFIX_TRIMMED } from "@/router/constants/route-prefix";
+import { ROUTE_PREFIX_TRIMMED } from "@/router/a-rewrite/constants/route-prefix";
 
 export function buildManualUrl(nextPage) {
     const queries = nextPage.params;
diff --git a/src/router/methods/helpers/consume-referral-info.js b/src/router/a-rewrite/methods/helpers/consume-referral-info.js
similarity index 100%
rename from src/router/methods/helpers/consume-referral-info.js
rename to src/router/a-rewrite/methods/helpers/consume-referral-info.js
diff --git a/src/router/methods/helpers/create-route.js b/src/router/a-rewrite/methods/helpers/create-route.js
similarity index 87%
rename from src/router/methods/helpers/create-route.js
rename to src/router/a-rewrite/methods/helpers/create-route.js
index 32410e3b3..a1535f3c8 100644
--- a/src/router/methods/helpers/create-route.js
+++ b/src/router/a-rewrite/methods/helpers/create-route.js
@@ -1,5 +1,5 @@
-import { lazyLoadComponent } from "@/router/methods/helpers/lazy-load-component";
-import { routeData } from "@/router/constants/routes";
+import { lazyLoadComponent } from "@/router/a-rewrite/methods/helpers/lazy-load-component";
+import { routeData } from "@/router/a-rewrite/constants/routes";
 
 export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
     return {
diff --git a/src/router/methods/helpers/get-destination.js b/src/router/a-rewrite/methods/helpers/get-destination.js
similarity index 85%
rename from src/router/methods/helpers/get-destination.js
rename to src/router/a-rewrite/methods/helpers/get-destination.js
index e123afcb1..cd04ddaad 100644
--- a/src/router/methods/helpers/get-destination.js
+++ b/src/router/a-rewrite/methods/helpers/get-destination.js
@@ -1,4 +1,4 @@
-import { routingTable } from "@/router/constants/routing-table";
+import { routingTable } from "@/router/a-rewrite/constants/routing-table";
 
 export function getDestination(sourcePageName, navigationScenario) {
     const table = routingTable();
diff --git a/src/router/methods/helpers/initialize-from-querystrings.js b/src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
similarity index 100%
rename from src/router/methods/helpers/initialize-from-querystrings.js
rename to src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
diff --git a/src/router/methods/helpers/lazy-load-component.js b/src/router/a-rewrite/methods/helpers/lazy-load-component.js
similarity index 100%
rename from src/router/methods/helpers/lazy-load-component.js
rename to src/router/a-rewrite/methods/helpers/lazy-load-component.js
diff --git a/src/router/methods/helpers/querystring-stash.js b/src/router/a-rewrite/methods/helpers/querystring-stash.js
similarity index 100%
rename from src/router/methods/helpers/querystring-stash.js
rename to src/router/a-rewrite/methods/helpers/querystring-stash.js
diff --git a/src/router/methods/helpers/requires-verified-redirect.js b/src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
similarity index 100%
rename from src/router/methods/helpers/requires-verified-redirect.js
rename to src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
diff --git a/src/router/methods/helpers/run-experiments.js b/src/router/a-rewrite/methods/helpers/run-experiments.js
similarity index 100%
rename from src/router/methods/helpers/run-experiments.js
rename to src/router/a-rewrite/methods/helpers/run-experiments.js
diff --git a/src/router/methods/helpers/save-page-data.js b/src/router/a-rewrite/methods/helpers/save-page-data.js
similarity index 100%
rename from src/router/methods/helpers/save-page-data.js
rename to src/router/a-rewrite/methods/helpers/save-page-data.js
diff --git a/src/router/methods/navigate-external.js b/src/router/a-rewrite/methods/navigate-external.js
similarity index 100%
rename from src/router/methods/navigate-external.js
rename to src/router/a-rewrite/methods/navigate-external.js
diff --git a/src/router/methods/navigate.js b/src/router/a-rewrite/methods/navigate.js
similarity index 79%
rename from src/router/methods/navigate.js
rename to src/router/a-rewrite/methods/navigate.js
index 7df947560..ca8de4784 100644
--- a/src/router/methods/navigate.js
+++ b/src/router/a-rewrite/methods/navigate.js
@@ -1,12 +1,18 @@
 import { saveSession } from "@/helpers/heritage-integration/order-helper";
-import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
-import { getDestination } from "@/router/methods/helpers/get-destination";
-import { savePageData } from "@/router/methods/helpers/save-page-data";
-import router from "@/router";
+import { buildManualUrl } from "@/router/a-rewrite/methods/helpers/build-manual-url";
+import { getDestination } from "@/router/a-rewrite/methods/helpers/get-destination";
+import { savePageData } from "@/router/a-rewrite/methods/helpers/save-page-data";
+import router from "@/router/a-rewrite";
 
-import { bailout } from "@/router/methods/error";
+import { bailout } from "@/router/a-rewrite/methods/error";
 
 async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
+    console.log(`Navigate:\n
+        - scenario: ${scenario}\n
+        - currentPage: ${currentPageName}\n
+        - withSaving: ${withSaving}\n
+        - forceTopLevelNav: ${forceTopLevelNav}`);
+    
     // Check to see if calling page is same as current page.
     // If not, cancel navigation before it begins.
     const callingRoute = currentPageName;
diff --git a/src/router/methods/page-prerequisites.js b/src/router/a-rewrite/methods/page-prerequisites.js
similarity index 87%
rename from src/router/methods/page-prerequisites.js
rename to src/router/a-rewrite/methods/page-prerequisites.js
index 8a6538eff..581ab0354 100644
--- a/src/router/methods/page-prerequisites.js
+++ b/src/router/a-rewrite/methods/page-prerequisites.js
@@ -1,4 +1,4 @@
-import { getRoute } from "@/router/methods/get-route";
+import { getRoute } from "@/router/a-rewrite/methods/get-route";
 
 export async function checkPagePrerequisites(pageName) {
     const route = getRoute(pageName);
diff --git a/src/router/methods/route-logic/auto-route.js b/src/router/a-rewrite/methods/route-logic/auto-route.js
similarity index 65%
rename from src/router/methods/route-logic/auto-route.js
rename to src/router/a-rewrite/methods/route-logic/auto-route.js
index 228f80483..a6d55e4fa 100644
--- a/src/router/methods/route-logic/auto-route.js
+++ b/src/router/a-rewrite/methods/route-logic/auto-route.js
@@ -1,6 +1,6 @@
-import { autoRouteTable } from "@/router/constants/auto-route-table";
-import { FUNNEL_START_PAGE } from "@/router/constants/routes";
-import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
+import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
+import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
 
 export async function autoRouteBeforeEnter(to, from) {
     for (let i = 0; i < autoRouteTable.length; i++) {
diff --git a/src/router/methods/route-logic/error.js b/src/router/a-rewrite/methods/route-logic/error.js
similarity index 92%
rename from src/router/methods/route-logic/error.js
rename to src/router/a-rewrite/methods/route-logic/error.js
index 8707a65d9..c4bdeb6d5 100644
--- a/src/router/methods/route-logic/error.js
+++ b/src/router/a-rewrite/methods/route-logic/error.js
@@ -2,8 +2,8 @@ import { globalEvents, globalEventTypes } from "@/constants/events";
 import { storeActions } from "@/constants/store-actions";
 import eventBus from "@/helpers/event-bus/event-bus";
 import baseMixin from "@/mixins/base-mixin";
-import router from "@/router";
-import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
+import router from "@/router/a-rewrite";
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
 import store from "@/store";
 
 export async function errorBeforeEnter(to, from) {
diff --git a/src/router/methods/route-logic/heritage.js b/src/router/a-rewrite/methods/route-logic/heritage.js
similarity index 100%
rename from src/router/methods/route-logic/heritage.js
rename to src/router/a-rewrite/methods/route-logic/heritage.js
diff --git a/src/router/methods/route-logic/insurance-company.js b/src/router/a-rewrite/methods/route-logic/insurance-company.js
similarity index 54%
rename from src/router/methods/route-logic/insurance-company.js
rename to src/router/a-rewrite/methods/route-logic/insurance-company.js
index d3c69b908..18d961854 100644
--- a/src/router/methods/route-logic/insurance-company.js
+++ b/src/router/a-rewrite/methods/route-logic/insurance-company.js
@@ -1,5 +1,5 @@
-import { routeData } from "@/router/constants/routes";
-import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
 
 export async function insuranceCompanyBeforeEnter(to, from) {
     if (isVerifiedInsurance()) {
diff --git a/src/router/methods/route-logic/landing.js b/src/router/a-rewrite/methods/route-logic/landing.js
similarity index 69%
rename from src/router/methods/route-logic/landing.js
rename to src/router/a-rewrite/methods/route-logic/landing.js
index b50f321c1..b71d7a9db 100644
--- a/src/router/methods/route-logic/landing.js
+++ b/src/router/a-rewrite/methods/route-logic/landing.js
@@ -1,8 +1,8 @@
-import router from "@/router";
-import { routeData } from "@/router/constants/routes";
-import { consumeReferralQuerystrings } from "@/router/methods/helpers/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/methods/helpers/initialize-from-querystrings";
-import { stashAllQueries } from "@/router/methods/helpers/querystring-stash";
+import router from "@/router/a-rewrite";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { consumeReferralQuerystrings } from "@/router/a-rewrite/methods/helpers/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/a-rewrite/methods/helpers/initialize-from-querystrings";
+import { stashAllQueries } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import store from "@/store";
 
 export async function landingBeforeEnter(to, from) {
diff --git a/src/router/methods/route-logic/load-session.js b/src/router/a-rewrite/methods/route-logic/load-session.js
similarity index 82%
rename from src/router/methods/route-logic/load-session.js
rename to src/router/a-rewrite/methods/route-logic/load-session.js
index 9265ed543..c70eb28d6 100644
--- a/src/router/methods/route-logic/load-session.js
+++ b/src/router/a-rewrite/methods/route-logic/load-session.js
@@ -1,5 +1,5 @@
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
-import { routeData } from "@/router/constants/routes";
+import { routeData } from "@/router/a-rewrite/constants/routes";
 
 export async function loadSessionBeforeEnter(to, from) {
     const loadSessionResponse = await loadSessionIfPresent(false, to.name);
diff --git a/src/router/methods/route-logic/quote.js b/src/router/a-rewrite/methods/route-logic/quote.js
similarity index 75%
rename from src/router/methods/route-logic/quote.js
rename to src/router/a-rewrite/methods/route-logic/quote.js
index a74e95577..9771b9bbb 100644
--- a/src/router/methods/route-logic/quote.js
+++ b/src/router/a-rewrite/methods/route-logic/quote.js
@@ -1,7 +1,7 @@
 import { queryStrings } from "@/constants/query-strings";
 import { storeMutations } from "@/constants/store-mutations";
-import { routeData } from "@/router/constants/routes";
-import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function quoteBeforeEnter(to, from) {
diff --git a/src/router/methods/route-logic/restart.js b/src/router/a-rewrite/methods/route-logic/restart.js
similarity index 84%
rename from src/router/methods/route-logic/restart.js
rename to src/router/a-rewrite/methods/route-logic/restart.js
index 015c997a0..4589999e0 100644
--- a/src/router/methods/route-logic/restart.js
+++ b/src/router/a-rewrite/methods/route-logic/restart.js
@@ -1,7 +1,7 @@
 import { storeActions } from "@/constants/store-actions";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import router from "@/router";
-import { FUNNEL_START_PAGE } from "@/router/constants/routes";
+import router from "@/router/a-rewrite";
+import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
 import store from "@/store";
 
 export async function restartBeforeEnter(to, from) {
diff --git a/src/router/methods/route-logic/vehicle.js b/src/router/a-rewrite/methods/route-logic/vehicle.js
similarity index 81%
rename from src/router/methods/route-logic/vehicle.js
rename to src/router/a-rewrite/methods/route-logic/vehicle.js
index e1da282d0..ed241d7de 100644
--- a/src/router/methods/route-logic/vehicle.js
+++ b/src/router/a-rewrite/methods/route-logic/vehicle.js
@@ -1,8 +1,8 @@
 import { storeMutations } from "@/constants/store-mutations";
 import { getBoolFromString } from "@/helpers/boolean-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routeData } from "@/router/constants/routes";
-import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function vehicleBeforeEnter(to, from) {
diff --git a/src/router/methods/routes.js b/src/router/a-rewrite/methods/routes.js
similarity index 60%
rename from src/router/methods/routes.js
rename to src/router/a-rewrite/methods/routes.js
index 0911b78dd..5cbc8e94e 100644
--- a/src/router/methods/routes.js
+++ b/src/router/a-rewrite/methods/routes.js
@@ -1,15 +1,15 @@
-import { createRoute, createVirtualRoute } from "@/router/methods/helpers/create-route";
-import { routeData } from "@/router/constants/routes";
+import { createRoute, createVirtualRoute } from "@/router/a-rewrite/methods/helpers/create-route";
+import { routeData } from "@/router/a-rewrite/constants/routes";
 
-import { vehicleBeforeEnter } from "@/router/methods/route-logic/vehicle";
-import { quoteBeforeEnter } from "@/router/methods/route-logic/quote";
-import { insuranceCompanyBeforeEnter } from "@/router/methods/route-logic/insurance-company";
-import { landingBeforeEnter } from "@/router/methods/route-logic/landing";
-import { heritageBeforeEnter } from "@/router/methods/route-logic/heritage";
-import { loadSessionBeforeEnter } from "@/router/methods/route-logic/load-session";
-import { autoRouteBeforeEnter } from "@/router/methods/route-logic/auto-route";
-import { errorBeforeEnter } from "@/router/methods/route-logic/error";
-import { restartBeforeEnter } from "@/router/methods/route-logic/restart";
+import { vehicleBeforeEnter } from "@/router/a-rewrite/methods/route-logic/vehicle";
+import { quoteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/quote";
+import { insuranceCompanyBeforeEnter } from "@/router/a-rewrite/methods/route-logic/insurance-company";
+import { landingBeforeEnter } from "@/router/a-rewrite/methods/route-logic/landing";
+import { heritageBeforeEnter } from "@/router/a-rewrite/methods/route-logic/heritage";
+import { loadSessionBeforeEnter } from "@/router/a-rewrite/methods/route-logic/load-session";
+import { autoRouteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/auto-route";
+import { errorBeforeEnter } from "@/router/a-rewrite/methods/route-logic/error";
+import { restartBeforeEnter } from "@/router/a-rewrite/methods/route-logic/restart";
 
 export const routes = [
     // Non-virtual pages.
diff --git a/src/router/dynamic-routing/component-loader.js b/src/router/dynamic-routing/component-loader.js
new file mode 100644
index 000000000..5e25fb2ce
--- /dev/null
+++ b/src/router/dynamic-routing/component-loader.js
@@ -0,0 +1,3 @@
+export function lazyLoadComponent(componentName) {
+    return () => import(`@/layouts/${componentName}/${componentName}.vue`); // /src/layouts/folder/component.vue
+}
diff --git a/src/router/index.js b/src/router/index.js
index cd842c5cb..eddc14e16 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,41 +1,936 @@
-import { routes } from "@/router/methods/routes";
-import { afterEach } from "@/router/methods/after-each";
-import { beforeEach } from "@/router/methods/before-each";
-import { bailout } from "@/router/methods/error";
-import {
-    navigateWithoutSaving,
-    navigateWithSaving,
-    navigateWithPageData,
-    navigateAndForceTopLevelNavigation,
-} from "@/router/methods/navigate";
-import { navigateToExternalUrl } from "@/router/methods/navigate-external";
-import { sendToReturnUser } from "@/router/methods/send-to-return-user";
+// Supporting files
 import { createWebHistory, createRouter } from "vue-router";
-import { ROUTE_PREFIX_FULL } from "@/router/constants/route-prefix";
+import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "../constants/store-mutations";
+import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
+import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
+import { routingTable } from "@/router/router-constants/routing-table.js";
+import { globalEvents, globalEventTypes } from "@/constants/events";
+import { queryStrings } from "@/constants/query-strings";
+import { getQuerystringParameter, buildQuerystringObject } from "@/helpers/querystring-helper";
+import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
+import { fmgPageValues, funnelStartPageName } from "@/router/router-constants/fmgPage-values";
+import { externalParameterStatus } from "@/constants/external-parameters";
+
+// Heritage integration
+import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
+import {
+    updateOrCreateFunnelCookie,
+    getFunnelCookie,
+    updateSessionIdCookie,
+    deleteFunnelCookie,
+    getAffiliateCookies,
+    setupAdvertiserTracking,
+} from "@/helpers/heritage-integration/cookie-helper";
+import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
+import {
+    getPageToRouteExistingOrderTo,
+    navigateToHeritageFunnel,
+    getImplicitNavigation,
+} from "@/helpers/heritage-integration/navigation-helper";
+
+import baseMixin from "@/mixins/base-mixin";
+import eventBus from "@/helpers/event-bus/event-bus";
+import store from "@/store";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import { experimentTriggers } from "../constants/experiments";
+import { applicationConfig } from "../constants/application-config";
+import { shouldStripPromoQueryString } from "@/helpers/promotions-helper";
+import bailout from "@/layouts/bailout/bailout";
+import { nextTick } from "vue";
+import { getBoolFromString } from "@/helpers/boolean-helper";
+
+const routes = [
+    {
+        path: "/bailout",
+        name: "bailout",
+        component: bailout,
+    },
+    {
+        path: "/",
+        name: "root",
+        async beforeEnter(to, from, next) {
+            // If we have no query string, or we don't have the FmgPage query string.
+            try {
+                log("------------- router index.js beforeEnter start -----------------");
+                log(" --to: ", to);
+                log(" --cookie: ", getFunnelCookie());
+                log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
+
+                await analyticsMixin.methods.validateSession();
+                var fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE);
+                var offerQuote = getQuerystringParameter(queryStrings.OFFER_QUOTE);
+                log(" --offerQuote: ", offerQuote);
+                // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
+                if (to.query) {
+                    delete to.query[queryStrings.FROM_HERITAGE];
+                }
+                //remove offerquote querystring if it exists
+                if (offerQuote) {
+                    delete to.query[queryStrings.OFFER_QUOTE];
+                }
+
+                if (getFunnelCookie()?.SuppressConceptFunnel) {
+                    log(" --go to heritage suppressConceptFunnel: ");
+                    await navigateToHeritageFunnel({ shouldSaveSession: false });
+                    return next(false);
+                }
+
+                // If the saved session has timed out, clear the session, execute 404 logic.
+                if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
+                    log(" --save session timeout go to start");
+
+                    const errorPayload = {
+                        cause: "expired session",
+                        currentPage: from?.query?.fmgPage,
+                        nextPage: to?.query?.fmgPage,
+                    };
+
+                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
+                    deleteFunnelCookie();
+                    GoToFunnelStartOn404(next, errorPayload);
+                    return;
+                }
+
+                const fromReturnUser = from?.name === fmgPageValues.RETURN_USER;
+                const fromContentSite = getQuerystringParameter(queryStrings.START_TYPE) === "fmg";
+                const toReturnUserPage = to.query?.fmgPage === fmgPageValues.RETURN_USER;
+                log(" --fromReturnUser ", fromReturnUser);
+                log(" --to.query.fmgPage ", to.query?.fmgPage);
+
+                // Intercept all navigation if a submitted order exists in storage
+                if (
+                    window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !==
+                    null
+                ) {
+                    if (to.query.fmgPage !== funnelStartPageName) {
+                        to.query.fmgPage = fmgPageValues.CONFIRMATION;
+                        log(
+                            ` --has ${sessionStorageKeyConstants.SUBMITTED_STATE} go to confirmation`
+                        );
+                    }
+                }
+                // On entering the funnel "fresh", read cookie information, decide what to do next.
+                else if (from.redirectedFrom === undefined || fromReturnUser) {
+                    // if entering the funnel from the content site, check and see if there is already a vehicle year in vuex.
+                    // if so, send them to return-user page.
+                    if (
+                        fromContentSite &&
+                        !toReturnUserPage &&
+                        store.getters.order.vehicle?.year > 0
+                    ) {
+                        log(" --from content site navigate to return user");
+                        var qso = {
+                            fmgPage: fmgPageValues.RETURN_USER,
+                        };
+
+                        const newQueryString = buildQuerystringObject(qso, true);
+                        log(" -- returnUser add querystring: " + JSON.stringify(newQueryString));
+
+                        router.push({
+                            path: "/",
+                            query: Object.assign({}, newQueryString),
+                        });
+                        return;
+                    }
+
+                    // clear the saveSessionPromise - if it exists in the vuex store but a new instance was created
+                    //   the saveSessionPromise will no longer point to a valid promise
+                    log(" --clear promise");
+                    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
+
+                    if (!to.query.fmgPage?.startsWith("payment")) {
+                        //payment pages used to return from safelitehop so exclude here
+                        // Remove the parameter after quote release
+
+                        // for testing end to end locally, see if there is a referralNumber on the querystring
+                        // that could have changed in heritage and then stick it in the store and then update the cookie
+                        // so load-session runs properly. this can be removed when heritage goes away
+                        const referralNumber = getQuerystringParameter(
+                            queryStrings.REFERRAL_NUMBER
+                        );
+                        const parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
+                        const correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
+                        if (referralNumber) {
+                            store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
+                            store.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccount);
+                            store.commit(
+                                storeMutations.UPDATE_REFERRAL_CORRELATION_ID,
+                                correlationId
+                            );
+                            log(" --update cookie");
+                            updateOrCreateFunnelCookie();
+                        }
+
+                        //Affiliate Cookies
+                        const affiliateCookies = getAffiliateCookies();
+                        if (affiliateCookies != null && affiliateCookies.length > 0) {
+                            store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
+                        }
+                        setupAdvertiserTracking();
+                        log(" --load session start");
+                        const loadSessionResponse = await loadSessionIfPresent(
+                            to.query.isInsurance != null
+                                ? to.query.isInsurance == "true"
+                                    ? true
+                                    : false
+                                : null,
+                            to.query.fmgPage
+                        );
+                        log(" --load session end");
+
+                        //Update external parameter state but not when returning from heritage
+                        if (!to.query.fmgPage?.startsWith("service-location") && !fromReturnUser) {
+                            updateExternalParameterState();
+                        }
+
+                        //Update CASH tab when return from heritage and have offerQuote param
+                        if (offerQuote === "true" && fromHeritage === "true") {
+                            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
+                        }
+
+                        // clear part related state because heritage selected a new vehicle
+                        if (
+                            to.query.fmgPage === fmgPageValues.VEHICLE &&
+                            getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration) &&
+                            !fromReturnUser
+                        ) {
+                            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
+                        }
+
+                        // if coming from the return user page, clear the destination page so implicit navigation runs
+                        log(" --to.query ", JSON.stringify(to.query));
+                        if (fromReturnUser && to.query) {
+                            log(" --clear to.query");
+                            delete to.query[queryStrings.FMG_PAGE];
+
+                            //to.query[queryStrings.FMG_PAGE] = "";
+                            log(" --to.query cleared ", JSON.stringify(to.query));
+                        }
+
+                        const pageToRedirectTo = await getPageToRouteExistingOrderTo(to);
+                        log(" --pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
+
+                        // This logic may determine that the user should be sent to heritage -- if so, do that here.
+                        if (pageToRedirectTo === fmgPageValues.HERITAGE) {
+                            // prettier-ignore
+                            log(" --go to heritage pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
+                            await navigateToHeritageFunnel({ shouldSaveSession: false });
+                            return next(false);
+                        }
+
+                        // Assign our fmgPage so it will load normally like the other pages.
+                        to.query.fmgPage = pageToRedirectTo;
+                        log(" --assign to: ", JSON.stringify(pageToRedirectTo));
+                    }
+                }
+
+                // Reroute around pages that should not be available.
+
+                // Exception 1: Integrated Users should not see vehicle or quote pages.
+                if (
+                    store.getters.payment?.insuranceCoverage?.isVerified ||
+                    store.getters.order?.referralNumber?.length === 6
+                ) {
+                    if (to.query.fmgPage === fmgPageValues.VEHICLE) {
+                        to.query.fmgPage = fmgPageValues.VEHICLE_DAMAGE;
+                    } else if (
+                        to.query.fmgPage === fmgPageValues.QUOTE ||
+                        to.query.fmgPage === fmgPageValues.INSURANCE_COMPANY
+                    ) {
+                        log(" --block quote page for integrated clients - go to heritage");
+                        // Push to heritage if going to quote & integrated.
+                        await navigateToHeritageFunnel({ shouldSaveSession: false });
+                        return next(false);
+                    }
+                }
+
+                await runExperiments(to.query.fmgPage);
+
+                //Affiliate Cookies
+                const affiliateCookies = getAffiliateCookies();
+                if (affiliateCookies != null && affiliateCookies.length > 0) {
+                    store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
+                }
+                setupAdvertiserTracking();
+                // Process funnel cookie.
+                updateOrCreateFunnelCookie();
+
+                // If we already have our route, go to it.
+                if (router.hasRoute(to.query.fmgPage)) {
+                    // Since our route is already in scope, we can grab the component from it and call the arePagePrerequisitesValid function.
+                    let component = router
+                        .getRoutes()
+                        .filter((x) => x.name === to.query.fmgPage)[0].components;
+
+                    // If the component hasn't been loaded fully, load it before we check prerequisites.
+                    if (component.default.methods === undefined) {
+                        component = await component.default();
+                    }
+
+                    if (!arePagePrerequisitesValid(component)) {
+                        console.log("Page prereq error: " + component.default.name);
+
+                        if (to.query.fmgPage === fmgPageValues.PAYMENT) {
+                            await store.getters.applicationUser.saveSessionPromise;
+                            window.location = applicationConfig.PIA_CANCEL_URL;
+                            return;
+                        }
+
+                        const errorPayload = {
+                            cause: "invalid page prerequisites for page",
+                            currentPage: from?.query?.fmgPage,
+                            nextPage: to?.query?.fmgPage,
+                        };
+
+                        GoToFunnelStartOn404(next, errorPayload);
+                        return;
+                    }
+
+                    log(" --has route:", to.query.fmgPage);
+                    return next({ name: to.query.fmgPage, query: to.query, params: to.params });
+                }
+
+                if (!isExistingFmgPageName(to.query.fmgPage)) {
+                    const errorPayload = {
+                        cause: "invalid page name",
+                        currentPage: from?.query?.fmgPage,
+                        nextPage: to?.query?.fmgPage,
+                    };
+
+                    GoToFunnelStartOn404(next, errorPayload);
+                    return;
+                }
+
+                // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms.
+                const routeData = GetRouteInfoFromPageName(to.query.fmgPage);
+                log("--routeData:", routeData);
+
+                // Add our dynamic route.
+                router.addRoute({
+                    path: routeData[0].path, // Always the same path, because we control it with query strings.
+                    name: routeData[0].name,
+                    component: routeData[0].component,
+                });
+
+                // Call the next components arePagePrerequisitesValid method before load.
+                // If it returns false, use the 404 logic.
+                const nextComponent = await router
+                    .getRoutes()
+                    .filter((x) => x.name === routeData[0].name)[0]
+                    .components.default();
+
+                if (!arePagePrerequisitesValid(nextComponent)) {
+                    // prettier-ignore
+                    console.log("Page Prereqs not valid for next component: " + nextComponent.default.name);
+
+                    const errorPayload = {
+                        cause: "invalid page prerequisites for page",
+                        currentPage: from?.query?.fmgPage,
+                        nextPage: to?.query?.fmgPage,
+                    };
+
+                    GoToFunnelStartOn404(next, errorPayload);
+                    return;
+                }
+
+                log("------------- router index.js beforeEnter end -----------------");
+
+                // Assign current query string parameters, as well as our fmgPage one.
+                next({
+                    name: routeData[0].name,
+                    query: Object.assign(to.query, { fmgPage: routeData[0].name }),
+                    params: to.params,
+                });
+            } catch (error) {
+                global.$logger.logError(`Routing ${error.stack}`);
+
+                if (to.query?.fmgPage === funnelStartPageName) {
+                    deleteFunnelCookie();
+                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
+                }
+
+                console.log(new Date() + " Exception in beforeEnter:" + JSON.stringify(error));
+
+                // If we don't have a route, go to our 404 page.
+                const errorPayload = {
+                    cause: "uncaught error in beforeEnter",
+                    currentPage: from?.query?.fmgPage,
+                    nextPage: to?.query?.fmgPage,
+                    fullError: error,
+                    errorStack: error?.stack,
+                };
+
+                GoToFunnelStartOn404(next, errorPayload);
+                return;
+            }
+        },
+    },
+];
 
 const router = createRouter({
-    history: createWebHistory(ROUTE_PREFIX_FULL),
+    history: createWebHistory("/fmg/"),
     routes,
-    // Scroll to top on navigation.
+    //Cause "page" to begin at the top when route chanages.
     scrollBehavior(to, from, savedPosition) {
+        // always scroll to top
         return { top: 0 };
     },
 });
 
-// Set guards
-router.afterEach(async (to, from) => afterEach(to, from));
-router.beforeEach(async (to, from) => beforeEach(to, from));
+//---------------------------------------------------------- Router Functions ----------------------------------------------------------
 
-// Bind methods for external use
-router.navigateWithSaving = navigateWithSaving;
-router.navigateWithoutSaving = navigateWithoutSaving;
-router.navigateWithPageData = navigateWithPageData;
-router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
+router.beforeEach(async (to, from, next) => {
+    log("------------- router index.js beforeEach start -----------------");
+    // set lastNavigationPage here to capture state before API calls for analytics.
+    // use current page url query string name when to.name is "root" (due to unresolved navigation in beforeEach)
+    router.lastNavigationPage = to.name == "root" ? analyticsMixin.methods.getPageName() : to.name;
 
-router.bailout = bailout;
+    const fromQueryPage = from.query?.fmgPage;
+    if (fromQueryPage === undefined) {
+        showFmgLoadingModal(true);
+    }
 
-router.navigateToExternalUrl = navigateToExternalUrl;
+    const toQueryPage = to.query?.fmgPage;
+    const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
+    const isInIframe = window !== window.top;
 
-router.sendToReturnUser = sendToReturnUser;
+    if (store.getters.externalParameterState?.isExternalParameter) {
+        // Check if alert event is on the bus
+        const alertEvent = eventBus.readEventFromBus(
+            globalEvents.Categories.GLOBAL_ALERT,
+            globalEvents.SubCategories.PAGE_NOT_FOUND
+        );
+        //Uknown alerts most likely were added by a failed api call in global-methods
+        const unknownAlertEvent = eventBus.readEventFromBus(
+            globalEvents.Categories.GLOBAL_ALERT,
+            globalEvents.SubCategories.UNKNOWN_ERROR
+        );
+        // If alert event is on the bus, then display the alert
+        if (alertEvent !== undefined || unknownAlertEvent !== undefined) {
+            store.commit(
+                storeMutations.UPDATE_IS_EXTERNAL_PARAMETER,
+                externalParameterStatus.INACTIVE
+            );
+        }
+    }
+    // fromPaymentToConfirmation workaround for navigating from an iframe but
+    // isInIframe evaluates to false for some reason when navigating from payment to confirmation
+    const fromPaymentToConfirmation =
+        fromQueryPage === fmgPageValues.PAYMENT && toQueryPage === fmgPageValues.CONFIRMATION;
+
+    if ((isInIframe && notToPIAReturn) || fromPaymentToConfirmation) {
+        const newUrl = `${window.top.location.origin}${to.href}`;
+        window.top.location.href = newUrl;
+        next(false);
+
+        // Refresh page if navigating to self to prevent locking.
+        // For now only carved out for vehicle; all modals are opened through anchor tags at the moment,
+        // which also self navigate, but relied on the page remaining the same on self-navigation.
+    } else if (toQueryPage === fromQueryPage && toQueryPage === getRedirectedStartPage()) {
+        router.go(0);
+        next(false);
+    } else {
+        next();
+    }
+    log("------------- router index.js beforeEach end -----------------");
+});
+
+router.afterEach(async (to, from) => {
+    // Update lastPageVisited in the store
+    store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
+
+    // If saving on navigation is requested, check for saved SessionId or EmailAddress to determine if saving is appropriate
+    if (getBoolFromString(window.history.state.isSavingNavigation)) {
+        if (
+            store.getters.applicationUser.savedSessionId ||
+            store.getters.order.customer?.emailAddress
+        ) {
+            await saveSession({ pageNameToLog: to.query.fmgPage });
+        }
+    }
+
+    // Push page view to GA
+    analyticsMixin.methods.pushPageViewToGA();
+
+    // Push experiments to Data Layer
+    analyticsMixin.methods.pushExperimentsToDataLayer();
+
+    // Push current order status to Data Layer
+    analyticsMixin.methods.pushOrderToDataLayer();
+
+    if (to.query.fmgPage == fmgPageValues.CONFIRMATION) {
+        //Push Ecommerce Cart to Data Layer
+        analyticsMixin.methods.pushECommerceCartToDataLayer();
+
+        //Push Product Array to Data Layer
+        analyticsMixin.methods.pushProductArrayToDataLayer();
+
+        //Push Commission Junction Gtm Data To Data Layer
+        analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
+    }
+});
+
+router.navigateWithoutSaving = (
+    scenario,
+    currentRoute,
+    optionalQuery = {},
+    optionalParams = {},
+    optionalPageData = {}
+) => {
+    navigate(scenario, currentRoute, false, optionalQuery, optionalParams, optionalPageData);
+};
+
+router.navigateWithSaving = (
+    scenario,
+    currentRoute,
+    optionalQuery = {},
+    optionalParams = {},
+    optionalPageData = {}
+) => {
+    navigate(scenario, currentRoute, true, optionalQuery, optionalParams, optionalPageData);
+};
+
+router.navigateToExternalUrl = (url, optionalQuery = {}) => {
+    log("------------- router navigateToExternalUrl -----------------");
+    log("url:", url);
+    navigateToUrl(url, optionalQuery);
+};
+
+router.navigateError = (errorPayload = null) => {
+    DisplayPageError(errorPayload);
+};
+
+//Use this navigation when you need to call next() explicitly. beforeRouteEnter is a good example.
+router.overrideNavigation = (
+    scenario,
+    currentRoute,
+    next,
+    isSavingNavigation,
+    optionalQuery = {},
+    optionalParams = {},
+    optionalPageData
+) => {
+    log("------------- router overrideNavigation -----------------");
+    log("scenario:", scenario);
+    log("currentRoute:", currentRoute);
+    log("isSavingNavigation:", isSavingNavigation);
+    log("optionalQuery:", optionalQuery);
+    log("optionalParams:", optionalParams);
+    log("optionalPageData:", optionalPageData);
+    navigate(
+        scenario,
+        currentRoute,
+        isSavingNavigation,
+        optionalQuery,
+        optionalParams,
+        optionalPageData
+    );
+    next();
+};
+
+router.getNextPage = () => nextPageName;
+
+// PRIVATE VARIABLES
+
+var nextPageName;
+
+// PRIVATE FUNCTIONS
+
+// Navigate to the next route, depending on the scenario.
+async function navigate(
+    scenario,
+    currentRoute,
+    isSavingNavigation,
+    optionalQuery = {},
+    optionalParams = {},
+    optionalPageData = {}
+) {
+    if (!scenario) {
+        console.error("No scenario provided. Please review the routing table.");
+        return;
+    }
+
+    // Match our maps up and navigate if we have a destination.
+    const matchingScenarioMap = getNavigationMap(scenario, currentRoute);
+    const destinationFmgPageValue = matchingScenarioMap.destinationFmgPageValue;
+
+    if (destinationFmgPageValue !== undefined) {
+        // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one.
+
+        nextPageName = destinationFmgPageValue;
+
+        // Update page data to the store for next page if provided. Otherwise, keep existing page data or set to empty object
+        const existingPageDataForPage = store.getters.pageData(destinationFmgPageValue);
+        baseMixin.methods.savePageDataToStore(
+            destinationFmgPageValue,
+            Object.keys(optionalPageData).length > 0
+                ? optionalPageData
+                : (existingPageDataForPage ?? {})
+        );
+
+        optionalParams.isSavingNavigation = isSavingNavigation;
+
+        // add querystring params to the route. if they are already in the store then no need to add them
+        var queryStringsObject = {
+            fmgPage: destinationFmgPageValue,
+        };
+
+        const hasZip = getQuerystringParameter(queryStrings.ZIP_CODE);
+        const zip = getQuerystringParameter(queryStrings.ZIP_CODE);
+        const promo = getQuerystringParameter(queryStrings.PROMO);
+        const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
+        const logQs = getQuerystringParameter(queryStrings.LOG);
+        baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
+
+        log("------------- router index.js navigate start -----------------");
+        log(" --scenario: ", scenario);
+        log(" --isSavingNavigation: ", isSavingNavigation);
+        log(" --optionalQuery: ", optionalQuery);
+        log(" --optionalParams: ", optionalParams);
+        log(" --optionalPageData: ", optionalPageData);
+        log(" --nextPageName: ", nextPageName);
+
+        if (
+            hasZip &&
+            (store.getters.order.serviceLocation.zipCode === undefined ||
+                store.getters.order.serviceLocation.zipCode == null) &&
+            (store.getters.order.vehicle.registration.zipCode === undefined ||
+                store.getters.order.vehicle.registration.zipCode == null)
+        ) {
+            queryStringsObject[queryStrings.ZIP_CODE] = zip;
+        }
+
+        if (promo && !shouldStripPromoQueryString(currentRoute.query.fmgPage)) {
+            queryStringsObject[queryStrings.PROMO] = promo;
+        }
+
+        if (pageError) {
+            queryStringsObject[queryStrings.PAGE_ERROR] = pageError;
+        }
+
+        if (logQs) {
+            queryStringsObject[queryStrings.LOG] = logQs;
+        }
+
+        log(" querystrings: ", queryStringsObject);
+        log("------------- router index.js navigate end -----------------");
+
+        router.push({
+            name: "root",
+            query: Object.assign(optionalQuery, queryStringsObject),
+            state: optionalParams,
+        });
+    } else if (matchingScenarioMap.destinationUrl !== undefined) {
+        navigateToUrl(matchingScenarioMap.destinationUrl, optionalQuery);
+    }
+}
+
+// Get navigation map depending on the scenario and the current 'page' you're on.
+function getNavigationMap(scenario, currentRoute) {
+    const fmgPageValue = currentRoute.query.fmgPage;
+    log("------------- router index.js getNavigationMap start -----------------");
+    log("fmgPage: " + fmgPageValue + " scenario: " + scenario, "");
+    log("------------- router index.js getNavigationMap end -----------------");
+    const matchedQueryValue = routingTable(store)
+        .filter(
+            (item) =>
+                item.fmgPageValue === fmgPageValue &&
+                item.maps.filter((map) => map.scenario === scenario).length > 0
+        )
+        .map((m) => m.maps.filter((map) => map.scenario === scenario))[0]
+        .filter((x) => x.filter === true || x.filter === undefined);
+
+    return matchedQueryValue[0];
+}
+
+function log(message, data) {
+    const log = getQuerystringParameter(queryStrings.LOG);
+    baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, log, false);
+
+    data = data ?? "";
+    const outData = typeof data === "object" ? JSON.stringify(data) : data;
+
+    if (log === "true" || store.getters.applicationUser.loggingOption) {
+        console.log(new Date() + message + outData);
+    }
+}
+
+//---------------------------------------------------------- Private Functions ----------------------------------------------------------
+
+// Navigate to an external url.
+function navigateToUrl(url, optionalQuery = {}) {
+    // possibly show some loading screen in the future here.
+    var externalUrl = new URL(url);
+
+    for (const queryKey in optionalQuery) {
+        externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
+    }
+
+    window.location.assign(externalUrl);
+}
+
+// Get route information by page name.
+// This will no longer reach out to the Cms. There is a 1:1 relationship between page names and route names and layouts.
+function GetRouteInfoFromPageName(pageName) {
+    // check if pagename is a valid route/component
+    if (!isExistingFmgPageName(pageName)) {
+        return [];
+    }
+
+    const routeData = [
+        {
+            path: "/",
+            name: pageName,
+            component: lazyLoadComponent(pageName),
+        },
+    ];
+
+    return routeData;
+}
+
+// Go to our start page on a 404.
+function GoToFunnelStartOn404(next, errorPayload = null) {
+    if (errorPayload !== null) {
+        errorPayload.type = "GoToFunnelStartOn404";
+        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+
+        console.log(
+            "%cGoToFunnelStartOn404()... errorPayload",
+            "color: white; background-color: blue; padding: 5px;",
+            errorPayload
+        );
+    }
+
+    // Put item on the bus
+    eventBus.addEventToBus(
+        globalEvents.Categories.GLOBAL_ALERT,
+        globalEvents.SubCategories.PAGE_NOT_FOUND,
+        {
+            isDismissible: true,
+            messageCopy: "You can get a quote by starting on this page.",
+            messageHeadline: "We're sorry, something went wrong.",
+            type: globalEventTypes.Danger,
+        }
+    );
+
+    next({
+        path: "/",
+        query: { fmgPage: funnelStartPageName },
+    });
+}
+
+async function DisplayPageError(errorPayload = null) {
+    console.log("%c running DisplayPageError()... ", "font-size: 20px; color: purple;");
+
+    if (errorPayload !== null) {
+        errorPayload.type = "DisplayPageError";
+        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+    } else {
+        // very cautiously to avoid additional errors:
+        var currentPage = "";
+        try {
+            currentPage = getQuerystringParameter(queryStrings.FMG_PAGE);
+        } catch (e) {
+            // pass
+        }
+        errorPayload = {
+            type: "DisplayPageError",
+            cause: "Unknown page error",
+            currentPage: currentPage,
+        };
+        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+    }
+
+    // Put item on the bus
+    eventBus.addEventToBus(
+        globalEvents.Categories.GLOBAL_ALERT,
+        globalEvents.SubCategories.UNKNOWN_ERROR,
+        {
+            isDismissible: true,
+            messageCopy: "",
+            messageHeadline: "We're sorry, something went wrong.",
+            type: globalEventTypes.Danger,
+        }
+    );
+    if (
+        store.getters.externalParameterState?.isExternalParameter == externalParameterStatus.ACTIVE
+    ) {
+        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.INACTIVE);
+    }
+    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
+    const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
+
+    // we use the pageError querystring as a counter to how many times a user has experienced an error and been routed here.
+    // once they receive more than 1 pageerrors, we'll reset their state to hopefully correct any issues they may be having.
+    var navPage = fmgPageValues.VEHICLE;
+    if (store.getters.payment?.insuranceCoverage?.isVerified) {
+        navPage = fmgPageValues.VEHICLE_DAMAGE;
+    }
+
+    if (pageError) {
+        var errorCount = Number(pageError);
+        if (errorCount > 1) {
+            deleteFunnelCookie();
+            await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
+
+            router.push({
+                path: "/",
+                query: { fmgPage: navPage },
+            });
+        } else {
+            errorCount++;
+            router.push({
+                path: "/",
+                query: { fmgPage: navPage, pageError: errorCount },
+            });
+        }
+    } else {
+        router.push({
+            path: "/",
+            query: { fmgPage: navPage, pageError: "1" },
+        });
+    }
+}
+
+function isExistingFmgPageName(pageName) {
+    const names = Object.values(fmgPageValues);
+
+    return names.some((name) => name === pageName);
+}
+
+// Checks arePagePrerequisitesValid on the component passed in.
+function arePagePrerequisitesValid(component) {
+    return component.default.methods.arePagePrerequisitesValid();
+}
+
+// Run SiteEntry and PageEntry triggers for experiments
+async function runExperiments(nextPage) {
+    if (!store.getters.applicationUser.triggeredSiteEntry) {
+        await baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
+            {
+                deviceId: getDeviceIdValue(),
+                triggerEvent: experimentTriggers.SITE_ENTRY,
+                triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
+            },
+            nextPage
+        );
+    }
+
+    await baseMixin.methods.dispatchStoreActionWithLogging(
+        storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
+        {
+            deviceId: getDeviceIdValue(),
+            triggerEvent: experimentTriggers.PAGE_ENTRY,
+            triggerValue: nextPage,
+        },
+        nextPage
+    );
+}
+
+function getRedirectedStartPage() {
+    if (store.getters.payment?.insuranceCoverage?.isVerified) {
+        return fmgPageValues.VEHICLE_DAMAGE;
+    } else {
+        return funnelStartPageName;
+    }
+}
+
+function updateExternalParameterState() {
+    const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
+    const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
+    const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
+    const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
+    const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
+    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
+    const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
+    const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
+    const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
+    const externalParameterServicePackage = getQuerystringParameter(queryStrings.SERVICE_PACKAGE);
+    const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
+    const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
+    const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
+    if (
+        externalParameterYear &&
+        externalParameterMake &&
+        externalParameterModel &&
+        externalParameterStyle
+    ) {
+        resetStoreForExternalParameter();
+        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
+    }
+    if (
+        externalParameterDamage &&
+        (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR" ||
+            externalParameterNumberOfChips?.length > 0)
+    ) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_DAMAGE_TYPE, externalParameterDamage);
+        if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPLACE") {
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS, null);
+        } else if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPAIR") {
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, true);
+            store.commit(
+                storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS,
+                externalParameterNumberOfChips
+            );
+        }
+    }
+    if (externalParameterZipCode) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
+    }
+    if (externalParameterEmail) {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
+            externalParameterEmail
+        );
+    }
+    if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE,
+            externalParameterServicePackage?.toLowerCase()
+        );
+    }
+    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
+            externalParameterVinSelection
+        );
+    }
+    if (externalParameterSource) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_SOURCE, externalParameterSource);
+    }
+    if (externalParameterPhoneNumber) {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
+            externalParameterPhoneNumber
+        );
+    }
+}
+
+// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
+// are returning.  clear out prior related things that need to be selected again like parts and damage type.
+function resetStoreForExternalParameter() {
+    if (
+        store.getters.externalParameterState?.isExternalParameter ==
+        externalParameterStatus.INACTIVE
+    ) {
+        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
+        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
+            state: null,
+            zipCode: null,
+            zipCodeCtu: null,
+        });
+        store.dispatch(storeActions.SAVE_EMAIL, null);
+        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+    }
+}
 
 export default router;
diff --git a/src/router/methods/send-to-return-user.js b/src/router/methods/send-to-return-user.js
deleted file mode 100644
index f1f864cb1..000000000
--- a/src/router/methods/send-to-return-user.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router";
-import { routeData } from "@/router/constants/routes";
-
-export function sendToReturnUser() {
-    analyticsMixin.methods.initSession();
-
-    router.push({
-        name: routeData.RETURN_USER.name,
-    });
-}
diff --git a/src/router/router-constants/externalUrl-values.js b/src/router/router-constants/externalUrl-values.js
new file mode 100644
index 000000000..5516095c4
--- /dev/null
+++ b/src/router/router-constants/externalUrl-values.js
@@ -0,0 +1,6 @@
+const externalUrls = {
+    HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
+    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
+};
+
+export { externalUrls };
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
new file mode 100644
index 000000000..1cba0414b
--- /dev/null
+++ b/src/router/router-constants/fmgPage-values.js
@@ -0,0 +1,32 @@
+const fmgPageValues = {
+    VEHICLE: "vehicle",
+    VEHICLE_DAMAGE: "vehicle-damage",
+    ADDRESS_LOOKUP: "address-lookup",
+    VIN_LOOKUP: "vin-lookup",
+    VEHICLE_PARTS: "vehicle-parts",
+    PART_QUESTIONS: "part-questions",
+    MOLDING_QUESTIONS: "molding-questions",
+    CAPABILITY_QUESTIONS: "capability-questions",
+    LICENSE_PLATE_LOOKUP: "license-plate-lookup",
+    ESTIMATE: "estimate",
+    SERVICE_ZIP: "service-zip",
+    ADDRESS_VEHICLES: "address-vehicles",
+    QUOTE: "quote",
+    INSURANCE_COMPANY: "insurance-company",
+    INSURANCE_DETAILS: "insurance-details",
+    SERVICE_LOCATION: "service-location",
+    HERITAGE: "heritage",
+    SCHEDULE: "schedule",
+    CUSTOMER_DETAILS: "customer-details",
+    PAYMENT_METHOD: "payment-method",
+    PAYMENT: "payment",
+    PAYMENT_PIA_RETURN: "payment-pia-return",
+    CONFIRMATION: "confirmation",
+    RETURN_USER: "return-user",
+    EMAIL_SMS_PAGES: "email-or-sms-related-pages",
+};
+
+const funnelStartPageName = fmgPageValues.VEHICLE;
+const returnUserPageName = fmgPageValues.RETURN_USER;
+
+export { fmgPageValues, funnelStartPageName, returnUserPageName };
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
new file mode 100644
index 000000000..56a40926a
--- /dev/null
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -0,0 +1,59 @@
+/**
+ * We want to name these to describe the scenario rather than what page(s) they're used on.
+ *
+ * Naming convention: [PAST_TENSE_VERB]_[DESCRIPTOR_OF_STATE]
+ * ex: Rather than "HAS_PART_QUESTIONS", we might name the
+ *     scenario "CLICKED_FORWARD_WITH_PART_QUESTIONS"
+ */
+
+const navigationScenarios = {
+    // General
+    CLICKED_BACK: "CLICKED_BACK",
+    CLICKED_FORWARD: "CLICKED_FORWARD",
+    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
+    CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
+
+    // Vin selection
+    CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
+    CLICKED_BACK_WITH_SKIP_VIN: "CLICKED_BACK_WITH_SKIP_VIN",
+    CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
+    CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE:
+        "CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE",
+    CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE:
+        "CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE",
+    CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
+    CLICKED_FORWARD_WITH_SKIP_VIN: "CLICKED_FORWARD_WITH_SKIP_VIN",
+    CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES: "CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES",
+    SELECTED_VIN_WITH_MISMATCHED_GLASS: "SELECTED_VIN_WITH_MISMATCHED_GLASS",
+    SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
+    SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
+    SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
+    SELECTED_NO_VIN: "SELECTED_NO_VIN",
+    CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
+    CLICKED_VIN_RETRY: "CLICKED_VIN_RETRY",
+
+    // Part selection
+    CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
+    CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE",
+    CLICKED_FORWARD_WITH_MOLDING_QUESTIONS: "CLICKED_FORWARD_WITH_MOLDING_QUESTIONS",
+    CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS: "CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS",
+    CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS: "CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS",
+    CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
+    CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
+    CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
+    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
+    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
+    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
+
+    // Schedule
+    CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
+
+    // Payment
+    CLICKED_INSURANCE: "CLICKED_INSURANCE",
+    CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
+    PIA_ERROR: "PIA_ERROR",
+    PIA_CC_ERROR: "PIA_CC_ERROR",
+    PIA_SUCCESS: "PIA_SUCCESS",
+};
+
+export { navigationScenarios };
diff --git a/src/router/router-constants/router-params.js b/src/router/router-constants/router-params.js
new file mode 100644
index 000000000..ae7b88283
--- /dev/null
+++ b/src/router/router-constants/router-params.js
@@ -0,0 +1,6 @@
+const routerParams = {
+    DISPLAY_VEHICLE_CHANGE_ALERT: "displayVehicleChangeAlert",
+    DISPLAY_PIA_ALERT: "displayPiaAlert",
+};
+
+export { routerParams };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
new file mode 100644
index 000000000..8891e7cff
--- /dev/null
+++ b/src/router/router-constants/routing-table.js
@@ -0,0 +1,546 @@
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+
+// Get store from router/index.js instead of importing it here to get updated values
+const routingTable = function (store) {
+    return [
+        {
+            fmgPageValue: fmgPageValues.VEHICLE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+            ],
+        },
+
+        {
+            fmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario:
+                        navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario:
+                        navigationScenarios.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.VIN_LOOKUP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
+                    destinationFmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.ESTIMATE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
+                    destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
+                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_NO_VIN,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.SERVICE_ZIP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.PART_QUESTIONS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.VEHICLE_PARTS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.QUOTE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
+                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.INSURANCE_COMPANY,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.INSURANCE_DETAILS,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.SERVICE_LOCATION,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.SCHEDULE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_NOW,
+                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.PAYMENT_METHOD,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_NOW,
+                    destinationFmgPageValue: fmgPageValues.PAYMENT,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_INSURANCE,
+                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.PAYMENT,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.PAYMENT_PIA_RETURN,
+            maps: [
+                {
+                    scenario: navigationScenarios.PIA_ERROR,
+                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.PIA_CC_ERROR,
+                    destinationFmgPageValue: fmgPageValues.PAYMENT,
+                },
+                {
+                    scenario: navigationScenarios.PIA_SUCCESS,
+                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.CONFIRMATION,
+        },
+        // The destination page for return user does not matter.  the router will invoke implicit navigation
+        {
+            fmgPageValue: fmgPageValues.RETURN_USER,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE,
+                },
+            ],
+        },
+    ];
+};
+
+export { routingTable };
diff --git a/src/store/index.js b/src/store/index.js
index e3cb7ca2c..468a9e9eb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,7 +10,7 @@ import { applicationConfig } from "@/constants/application-config";
 import { experimentTriggers } from "@/constants/experiments";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { singleWindshieldCarIds } from "@/constants/single-windshield-carids";
-import { routeData } from "@/router/constants/routes";
+import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper.js";
 import { deepEqual } from "@/helpers/object-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -599,10 +599,10 @@ export const mutations = {
         state.order.damage.partQuestionAnswers = null;
         state.order.damage.moldingQuestionAnswers = null;
         state.order.damage.capabilityQuestionAnswers = null;
-        state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
-        state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
-        state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
-        state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
+        state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
+        state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
+        state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
+        state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
     },
     resetSchedule(state) {
         state.order.schedule.date = null;
@@ -666,10 +666,10 @@ export const mutations = {
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
-            state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
-            state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
-            state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
-            state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
+            state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
+            state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
+            state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
+            state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
         }
 
         state.order.vehicle = Object.assign(state.order.vehicle, {
@@ -1065,7 +1065,7 @@ export const getters = {
         // if we're here, then we have both email and phone so get the value from pageData to reflect what they entered on the page.
         // if they didn't enter anything on the page default to email
         return (
-            state.applicationUser.pageData[routeData.SERVICE_ZIP.name]?.emailOrSmsValue ??
+            state.applicationUser.pageData[fmgPageValues.EMAIL_SMS_PAGES]?.emailOrSmsValue ??
             state.order.customer.emailAddress
         );
     },
@@ -1989,7 +1989,7 @@ export const actions = {
 
     getPartFromCapabilityQuestionAnswer(context, { payload, pageNameToLog }) {
         const glassLocation = payload;
-        const pageData = context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name);
+        const pageData = context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
 
         const part = pageData.partsOrQuestions.find((x) => x.glassLocation === glassLocation)
             .parts[0];
@@ -2627,15 +2627,15 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: routeData.VEHICLE_PARTS.name,
+                page: fmgPageValues.VEHICLE_PARTS,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: routeData.MOLDING_QUESTIONS.name,
+                page: fmgPageValues.MOLDING_QUESTIONS,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: routeData.CAPABILITY_QUESTIONS.name,
+                page: fmgPageValues.CAPABILITY_QUESTIONS,
                 data: null,
             });
         }
@@ -2646,8 +2646,8 @@ export const actions = {
 
     resetMoldingAndCapabilityQuestionAnswersIfNeeded(context, matchedParts) {
         const partsOrQuestionsDataToCompareWith =
-            context.getters.pageData(routeData.MOLDING_QUESTIONS.name)?.partsOrQuestions ??
-            context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)?.partsOrQuestions ??
+            context.getters.pageData(fmgPageValues.MOLDING_QUESTIONS)?.partsOrQuestions ??
+            context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)?.partsOrQuestions ??
             [];
 
         function getAllPartNumbers(partsOrQuestions) {
@@ -2676,11 +2676,11 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: routeData.MOLDING_QUESTIONS.name,
+                page: fmgPageValues.MOLDING_QUESTIONS,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: routeData.CAPABILITY_QUESTIONS.name,
+                page: fmgPageValues.CAPABILITY_QUESTIONS,
                 data: null,
             });
         }
@@ -2708,7 +2708,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: routeData.CAPABILITY_QUESTIONS.name,
+                page: fmgPageValues.CAPABILITY_QUESTIONS,
                 data: null,
             });
         }

From 0b80154cd9bf6cafed54079eb3cadaec7d941a1b Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:38:08 -0400
Subject: [PATCH 47/64] Revert "Big split"

This reverts commit fac7866e75b998fd20fdce32fa8068229c734f3e.
---
 src/layouts/estimate/estimate.vue             |   2 +-
 .../license-plate-lookup.vue                  |   2 +-
 src/layouts/payment-method/payment-method.vue |   2 +-
 src/layouts/quote/quote.vue                   |   2 +-
 src/layouts/service-zip/service-zip.vue       |   2 +-
 src/layouts/vehicle/vehicle.vue               |   2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |   2 +-
 .../a-rewrite/constants/externalUrl-values.js |   6 -
 src/router/a-rewrite/index.js                 | 425 +++++++++++++++++-
 .../helpers => logic}/build-manual-url.js     |   2 +-
 .../consume-referral-info.js                  |   0
 .../helpers => logic}/create-route.js         |   2 +-
 .../helpers => logic}/get-destination.js      |   0
 .../initialize-from-querystrings.js           |   0
 .../helpers => logic}/lazy-load-component.js  |   0
 .../helpers => logic}/querystring-stash.js    |   0
 .../requires-verified-redirect.js             |   0
 .../helpers => logic}/run-experiments.js      |   0
 .../helpers => logic}/save-page-data.js       |   0
 src/router/a-rewrite/methods/after-each.js    |  12 -
 src/router/a-rewrite/methods/before-each.js   |  83 ----
 src/router/a-rewrite/methods/error.js         |  17 -
 src/router/a-rewrite/methods/get-route.js     |   5 -
 .../a-rewrite/methods/navigate-external.js    |  10 -
 src/router/a-rewrite/methods/navigate.js      |  84 ----
 .../a-rewrite/methods/page-prerequisites.js   |  22 -
 .../methods/route-logic/auto-route.js         |  23 -
 .../a-rewrite/methods/route-logic/error.js    |  52 ---
 .../a-rewrite/methods/route-logic/heritage.js |   5 -
 .../methods/route-logic/insurance-company.js  |  11 -
 .../a-rewrite/methods/route-logic/landing.js  |  38 --
 .../methods/route-logic/load-session.js       |  11 -
 .../a-rewrite/methods/route-logic/quote.js    |  20 -
 .../a-rewrite/methods/route-logic/restart.js  |  22 -
 .../a-rewrite/methods/route-logic/vehicle.js  |  21 -
 src/router/a-rewrite/methods/routes.js        |  46 --
 36 files changed, 413 insertions(+), 518 deletions(-)
 delete mode 100644 src/router/a-rewrite/constants/externalUrl-values.js
 rename src/router/a-rewrite/{methods/helpers => logic}/build-manual-url.js (93%)
 rename src/router/a-rewrite/{methods/helpers => logic}/consume-referral-info.js (100%)
 rename src/router/a-rewrite/{methods/helpers => logic}/create-route.js (92%)
 rename src/router/a-rewrite/{methods/helpers => logic}/get-destination.js (100%)
 rename src/router/a-rewrite/{methods/helpers => logic}/initialize-from-querystrings.js (100%)
 rename src/router/a-rewrite/{methods/helpers => logic}/lazy-load-component.js (100%)
 rename src/router/a-rewrite/{methods/helpers => logic}/querystring-stash.js (100%)
 rename src/router/a-rewrite/{methods/helpers => logic}/requires-verified-redirect.js (100%)
 rename src/router/a-rewrite/{methods/helpers => logic}/run-experiments.js (100%)
 rename src/router/a-rewrite/{methods/helpers => logic}/save-page-data.js (100%)
 delete mode 100644 src/router/a-rewrite/methods/after-each.js
 delete mode 100644 src/router/a-rewrite/methods/before-each.js
 delete mode 100644 src/router/a-rewrite/methods/error.js
 delete mode 100644 src/router/a-rewrite/methods/get-route.js
 delete mode 100644 src/router/a-rewrite/methods/navigate-external.js
 delete mode 100644 src/router/a-rewrite/methods/navigate.js
 delete mode 100644 src/router/a-rewrite/methods/page-prerequisites.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/auto-route.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/error.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/heritage.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/insurance-company.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/landing.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/load-session.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/quote.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/restart.js
 delete mode 100644 src/router/a-rewrite/methods/route-logic/vehicle.js
 delete mode 100644 src/router/a-rewrite/methods/routes.js

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 66d1544d9..0a5db7d74 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 673116965..a6bb07bab 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -119,7 +119,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 51a3ffd5d..d07434c1f 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,7 +168,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index c095d00be..f100a9f32 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -169,7 +169,7 @@ import {
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 6e0bccda6..16c6f7f72 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -96,7 +96,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 8686be85b..1d2e7d2bb 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -113,7 +113,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import {
     consumeQueryFromStash,
     peekQueryFromStash,
-} from "@/router/a-rewrite/methods/helpers/querystring-stash";
+} from "@/router/a-rewrite/logic/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 277e176f5..5db93d76d 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -160,7 +160,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
diff --git a/src/router/a-rewrite/constants/externalUrl-values.js b/src/router/a-rewrite/constants/externalUrl-values.js
deleted file mode 100644
index 5516095c4..000000000
--- a/src/router/a-rewrite/constants/externalUrl-values.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const externalUrls = {
-    HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
-    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
-};
-
-export { externalUrls };
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
index 37bd5aa0d..3a84a1730 100644
--- a/src/router/a-rewrite/index.js
+++ b/src/router/a-rewrite/index.js
@@ -1,16 +1,216 @@
-import { routes } from "@/router/a-rewrite/methods/routes";
-import { afterEach } from "@/router/a-rewrite/methods/after-each";
-import { beforeEach } from "@/router/a-rewrite/methods/before-each";
-import { bailout } from "@/router/a-rewrite/methods/error";
-import {
-    navigateWithoutSaving,
-    navigateWithSaving,
-    navigateWithPageData,
-    navigateAndForceTopLevelNavigation,
-} from "@/router/a-rewrite/methods/navigate";
-import { navigateToExternalUrl } from "@/router/a-rewrite/methods/navigate-external";
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { createRoute, createVirtualRoute } from "@/router/a-rewrite/logic/create-route";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { createWebHistory, createRouter } from "vue-router";
+import { getDestination } from "@/router/a-rewrite/logic/get-destination";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import {
+    getFunnelCookie,
+    deleteFunnelCookie,
+    updateOrCreateFunnelCookie,
+} from "@/helpers/heritage-integration/cookie-helper";
+import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
+import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
+import store from "@/store";
+import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations";
+import { sessionStorageKeyConstants } from "@/constants/session-storage";
+import { savePageData } from "@/router/a-rewrite/logic/save-page-data";
+import eventBus from "@/helpers/event-bus/event-bus";
+import { globalEvents, globalEventTypes } from "@/constants/events";
+import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
+import { queryStrings } from "@/constants/query-strings";
+import { consumeReferralQuerystrings } from "@/router/a-rewrite/logic/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/a-rewrite/logic/initialize-from-querystrings";
+import { getBoolFromString } from "@/helpers/boolean-helper";
+import { isVerifiedInsurance } from "@/router/a-rewrite/logic/requires-verified-redirect";
+import baseMixin from "@/mixins/base-mixin";
+import { runExperiments } from "@/router/a-rewrite/logic/run-experiments";
 import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
+import { buildManualUrl } from "@/router/a-rewrite/logic/build-manual-url";
+import { consumeQueryFromStash, stashAllQueries } from "@/router/a-rewrite/logic/querystring-stash";
+
+const routes = [
+    // Non-virtual pages.
+    createRoute(routeData.VEHICLE, async (to, from) => {
+        // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
+        const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
+        if (hasVehicleChanged) {
+            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
+        }
+
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.VEHICLE_DAMAGE.name,
+                replace: true,
+            };
+        }
+    }),
+    createRoute(routeData.VEHICLE_DAMAGE),
+    createRoute(routeData.ESTIMATE),
+    createRoute(routeData.ADDRESS_LOOKUP),
+    createRoute(routeData.VIN_LOOKUP),
+    createRoute(routeData.LICENSE_PLATE_LOOKUP),
+    createRoute(routeData.SERVICE_ZIP),
+    createRoute(routeData.ADDRESS_VEHICLES),
+    createRoute(routeData.VEHICLE_PARTS),
+    createRoute(routeData.PART_QUESTIONS),
+    createRoute(routeData.MOLDING_QUESTIONS),
+    createRoute(routeData.CAPABILITY_QUESTIONS),
+    createRoute(routeData.QUOTE, async (to, from) => {
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.HERITAGE.name,
+                replace: true,
+            };
+        }
+
+        const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
+
+        if (offerQuote === "true") {
+            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
+        }
+    }),
+    createRoute(routeData.INSURANCE_COMPANY, async (to, from) => {
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.HERITAGE.name,
+                replace: true,
+            };
+        }
+    }),
+    createRoute(routeData.SERVICE_LOCATION),
+    createRoute(routeData.SCHEDULE),
+    createRoute(routeData.CUSTOMER_DETAILS),
+    createRoute(routeData.PAYMENT_METHOD),
+    createRoute(routeData.PAYMENT),
+    createRoute(routeData.PAYMENT_PIA_RETURN),
+    createRoute(routeData.CONFIRMATION),
+    createRoute(routeData.RETURN_USER),
+
+    // Virtual pages (resolve to a non-virtual page.)
+    createVirtualRoute(routeData.LANDING, async (to, from) => {
+        await initializeFromQueryStrings();
+        // Save querystrings to temporary stash so they can be referred to later.
+        stashAllQueries(to);
+        // Change referral info. For use in local testing for insurance crossover.
+        await consumeReferralQuerystrings();
+
+        // Check for fmgpage parameter
+        const fmgPage = to?.query?.fmgPage;
+        if (fmgPage && router.hasRoute(fmgPage)) {
+            return {
+                name: fmgPage,
+                replace: true,
+            };
+        }
+
+        // If a session is still in memory, go to return-user.
+        if (store.getters.vehicle?.year > 0) {
+            console.log(`trying to redirect!`);
+            return {
+                name: routeData.RETURN_USER.name,
+                replace: true,
+            };
+        }
+
+        // Otherwise, load session and auto-route
+        return {
+            name: routeData.LOAD_SESSION.name,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.HERITAGE, async (to, from) => {
+        await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
+    }),
+    createVirtualRoute(routeData.LOAD_SESSION, async (to, from) => {
+        const loadSessionResponse = await loadSessionIfPresent(false, to.name);
+
+        return {
+            name: routeData.AUTO_ROUTE.name,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.AUTO_ROUTE, async (to, from) => {
+        for (let i = 0; i < autoRouteTable.length; i++) {
+            const testRouteData = autoRouteTable[i];
+
+            const isReady = await router.checkPagePrerequisites(testRouteData.name);
+
+            if (isReady) {
+                return {
+                    name: testRouteData.name,
+                    replace: true,
+                };
+            }
+        }
+
+        return {
+            name: FUNNEL_START_PAGE,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.ERROR, async (to, from) => {
+        // If we've already encountered one error, clear session to avoid more.
+        // Otherwise mark that we encoutnered an error here.
+        if (store.getters.applicationUser.hasAlreadyTriggeredError) {
+            return {
+                name: routeData.RESTART.name,
+                replace: true,
+            };
+        } else {
+            await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
+        }
+
+        // Add error event to bus
+        eventBus.addEventToBus(
+            globalEvents.Categories.GLOBAL_ALERT,
+            globalEvents.SubCategories.UNKNOWN_ERROR,
+            {
+                isDismissable: true,
+                messageCopy: "",
+                messageHeadline: "We're sorry, something went wrong.",
+                type: globalEventTypes.Danger,
+            }
+        );
+
+        let nextPage = FUNNEL_START_PAGE.name;
+
+        baseMixin.methods?.ResetExternalParamsAndHideModal();
+
+        if (store.getters.payment?.insuranceCoverage?.isVerified) {
+            nextPage = routeData.VEHICLE_DAMAGE.name;
+        }
+
+        if (from.name === nextPage) {
+            // Router won't load the page if we redirect to the already existing page
+            // Force refresh in this scenario.
+            router.go(0);
+            return false;
+        }
+
+        return {
+            name: nextPage,
+            replace: false,
+        };
+    }),
+    createVirtualRoute(routeData.RESTART, async (to, from) => {
+        await store.dispatch(storeActions.RESET_STATE);
+        deleteFunnelCookie();
+
+        if (from.name === FUNNEL_START_PAGE.name) {
+            // Router won't load the page if we redirect to the already existing page
+            // Force refresh in this scenario.
+            router.go(0);
+            return false;
+        }
+
+        return {
+            name: FUNNEL_START_PAGE.name,
+            replace: true,
+        };
+    }),
+];
 
 const router = createRouter({
     history: createWebHistory(ROUTE_PREFIX_FULL),
@@ -21,18 +221,201 @@ const router = createRouter({
     },
 });
 
-// Set guards
-router.afterEach(async (to, from) => afterEach(to, from));
-router.beforeEach(async (to, from) => beforeEach(to, from));
+////-- Global Guards
 
-// Bind methods for external use
-router.navigateWithSaving = navigateWithSaving;
-router.navigateWithoutSaving = navigateWithoutSaving;
-router.navigateWithPageData = navigateWithPageData;
-router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
+router.beforeEach(async (to, from) => {
+    console.log(to);
+    try {
+        await analyticsMixin.methods.validateSession();
 
-router.bailout = bailout;
+        if (getFunnelCookie()?.SuppressConceptFunnel) {
+            // Redirect to heritage.
+            return {
+                name: routeData.HERITAGE.name,
+            };
+        }
 
-router.navigateToExternalUrl = navigateToExternalUrl;
+        // Ensure session has not expired
+        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
+            const errorPayload = {
+                cause: "expired session",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            router.bailout(errorPayload, true);
+            return false;
+        }
+
+        // Block navigation if an order has been submitted.
+        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
+            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
+                return false;
+            }
+        }
+
+        // Process funnel cookie.
+        updateOrCreateFunnelCookie();
+
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
+        // Ensure page-prerequisites are fulfilled
+        const arePagePrerequisitesValid = await router.checkPagePrerequisites(to.name);
+
+        if (!arePagePrerequisitesValid) {
+            const errorPayload = {
+                cause: "invalid page prerequisites for page",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            router.bailout(errorPayload);
+            return;
+        }
+
+        await runExperiments(to.name);
+    } catch (error) {
+        const errorPayload = {
+            cause: "Uncaught exception in `beforeEach`.",
+            currentPage: from?.name,
+            nextPage: to?.name,
+        };
+
+        console.log(error);
+
+        router.bailout(errorPayload);
+        return;
+    }
+});
+
+router.afterEach(async (to, from) => {
+    // Push page view to GA
+    analyticsMixin.methods.pushPageViewToGA();
+
+    // Push experiments to Data Layer
+    analyticsMixin.methods.pushExperimentsToDataLayer();
+
+    // Push current order status to Data Layer
+    analyticsMixin.methods.pushOrderToDataLayer();
+});
+
+////-- End Global Guards
+
+////-- Bound Functions
+
+router.getRoute = (pageName) => {
+    return router.getRoutes().find((r) => r.name === pageName);
+};
+
+router.checkPagePrerequisites = async (pageName) => {
+    const route = router.getRoute(pageName);
+
+    if (!route) {
+        return false;
+    }
+
+    let component = route.components;
+
+    // Virtual routes have no component, so skip check.
+    if (!component) {
+        return true;
+    }
+
+    if (component?.default?.methods === undefined) {
+        component = await component?.default();
+    }
+
+    return component?.default?.methods?.arePagePrerequisitesValid();
+};
+
+router.navigateWithoutSaving = async (scenario, currentPageName) => {
+    return await router.navigate(currentPageName, scenario, false);
+};
+
+router.navigateWithSaving = async (scenario, currentPageName) => {
+    return await router.navigate(currentPageName, scenario, true);
+};
+
+router.navigateWithPageData = async (scenario, currentPageName, pageData = {}) => {
+    const nextPage = getDestination(currentPageName, scenario);
+    await savePageData(nextPage.name, pageData);
+
+    return await router.navigate(currentPageName, scenario, true);
+};
+
+router.navigateAndForceTopLevelNavigation = async (scenario, currentPageName, saving = false) => {
+    return await router.navigate(currentPageName, scenario, saving, true);
+};
+
+router.bailout = (errorPayload, forceRestart = false) => {
+    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+
+    if (forceRestart) {
+        router.push({
+            name: routeData.RESTART.name,
+        });
+    } else {
+        router.push({
+            name: routeData.ERROR.name,
+        });
+    }
+};
+
+router.navigate = async (
+    currentPageName,
+    scenario,
+    withSaving = false,
+    forceTopLevelNav = false
+) => {
+    // Check to see if calling page is same as current page.
+    // If not, cancel navigation before it begins.
+    const callingRoute = currentPageName;
+    const actualRoute = router.currentRoute.value.name;
+
+    if (callingRoute !== actualRoute) {
+        return false;
+    }
+
+    const nextPage = getDestination(currentPageName, scenario);
+
+    if (!nextPage) {
+        console.error(
+            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
+        );
+
+        const errorPayload = {
+            cause: "invalid page name",
+            currentPage: currentPageName,
+            nextPage: nextPage?.name,
+        };
+
+        router.bailout(errorPayload);
+        return;
+    }
+
+    if (withSaving) {
+        await saveSession({ pageNameToLog: nextPage.name });
+    }
+
+    // Some pages require manually setting the next url
+    // to work with iframes.
+    if (forceTopLevelNav) {
+        const newUrl = buildManualUrl(nextPage);
+        window.top.location.href = newUrl;
+        return;
+    }
+
+    // All other pages use router.push
+    router.push({
+        name: nextPage.name,
+        query: nextPage.params ?? {},
+    });
+};
+
+////-- End Router Functions
 
 export default router;
diff --git a/src/router/a-rewrite/methods/helpers/build-manual-url.js b/src/router/a-rewrite/logic/build-manual-url.js
similarity index 93%
rename from src/router/a-rewrite/methods/helpers/build-manual-url.js
rename to src/router/a-rewrite/logic/build-manual-url.js
index 260b41257..017816d6b 100644
--- a/src/router/a-rewrite/methods/helpers/build-manual-url.js
+++ b/src/router/a-rewrite/logic/build-manual-url.js
@@ -9,7 +9,7 @@ export function buildManualUrl(nextPage) {
     return url;
 }
 
-export function buildSearchParams(paramList) {
+function buildSearchParams(paramList) {
     if (!paramList) {
         return "";
     }
diff --git a/src/router/a-rewrite/methods/helpers/consume-referral-info.js b/src/router/a-rewrite/logic/consume-referral-info.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/consume-referral-info.js
rename to src/router/a-rewrite/logic/consume-referral-info.js
diff --git a/src/router/a-rewrite/methods/helpers/create-route.js b/src/router/a-rewrite/logic/create-route.js
similarity index 92%
rename from src/router/a-rewrite/methods/helpers/create-route.js
rename to src/router/a-rewrite/logic/create-route.js
index a1535f3c8..44e27b568 100644
--- a/src/router/a-rewrite/methods/helpers/create-route.js
+++ b/src/router/a-rewrite/logic/create-route.js
@@ -1,4 +1,4 @@
-import { lazyLoadComponent } from "@/router/a-rewrite/methods/helpers/lazy-load-component";
+import { lazyLoadComponent } from "@/router/a-rewrite/logic/lazy-load-component";
 import { routeData } from "@/router/a-rewrite/constants/routes";
 
 export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
diff --git a/src/router/a-rewrite/methods/helpers/get-destination.js b/src/router/a-rewrite/logic/get-destination.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/get-destination.js
rename to src/router/a-rewrite/logic/get-destination.js
diff --git a/src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js b/src/router/a-rewrite/logic/initialize-from-querystrings.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
rename to src/router/a-rewrite/logic/initialize-from-querystrings.js
diff --git a/src/router/a-rewrite/methods/helpers/lazy-load-component.js b/src/router/a-rewrite/logic/lazy-load-component.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/lazy-load-component.js
rename to src/router/a-rewrite/logic/lazy-load-component.js
diff --git a/src/router/a-rewrite/methods/helpers/querystring-stash.js b/src/router/a-rewrite/logic/querystring-stash.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/querystring-stash.js
rename to src/router/a-rewrite/logic/querystring-stash.js
diff --git a/src/router/a-rewrite/methods/helpers/requires-verified-redirect.js b/src/router/a-rewrite/logic/requires-verified-redirect.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
rename to src/router/a-rewrite/logic/requires-verified-redirect.js
diff --git a/src/router/a-rewrite/methods/helpers/run-experiments.js b/src/router/a-rewrite/logic/run-experiments.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/run-experiments.js
rename to src/router/a-rewrite/logic/run-experiments.js
diff --git a/src/router/a-rewrite/methods/helpers/save-page-data.js b/src/router/a-rewrite/logic/save-page-data.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/save-page-data.js
rename to src/router/a-rewrite/logic/save-page-data.js
diff --git a/src/router/a-rewrite/methods/after-each.js b/src/router/a-rewrite/methods/after-each.js
deleted file mode 100644
index ef3dc0d93..000000000
--- a/src/router/a-rewrite/methods/after-each.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import analyticsMixin from "@/mixins/analytics-mixin";
-
-export async function afterEach(to, from) {
-    // Push page view to GA
-    analyticsMixin.methods.pushPageViewToGA();
-
-    // Push experiments to Data Layer
-    analyticsMixin.methods.pushExperimentsToDataLayer();
-
-    // Push current order status to Data Layer
-    analyticsMixin.methods.pushOrderToDataLayer();
-}
diff --git a/src/router/a-rewrite/methods/before-each.js b/src/router/a-rewrite/methods/before-each.js
deleted file mode 100644
index 05264ed3c..000000000
--- a/src/router/a-rewrite/methods/before-each.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import { queryStrings } from "@/constants/query-strings";
-import { sessionStorageKeyConstants } from "@/constants/session-storage";
-import {
-    getFunnelCookie,
-    updateOrCreateFunnelCookie,
-} from "@/helpers/heritage-integration/cookie-helper";
-import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
-import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
-import { runExperiments } from "@/router/a-rewrite/methods/helpers/run-experiments";
-
-import { bailout } from "@/router/a-rewrite/methods/error";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
-
-export async function beforeEach(to, from) {
-    try {
-        await analyticsMixin.methods.validateSession();
-
-        if (getFunnelCookie()?.SuppressConceptFunnel) {
-            // Redirect to heritage.
-            return {
-                name: routeData.HERITAGE.name,
-            };
-        }
-
-        // Ensure session has not expired
-        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
-            const errorPayload = {
-                cause: "expired session",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            bailout(errorPayload, true);
-            return false;
-        }
-
-        // Block navigation if an order has been submitted.
-        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
-            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
-                return false;
-            }
-        }
-
-        // Process funnel cookie.
-        updateOrCreateFunnelCookie();
-
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
-        // Ensure page-prerequisites are fulfilled
-        const arePagePrerequisitesValid = await checkPagePrerequisites(to.name);
-
-        if (!arePagePrerequisitesValid) {
-            const errorPayload = {
-                cause: "invalid page prerequisites for page",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            bailout(errorPayload);
-            return;
-        }
-
-        await runExperiments(to.name);
-    } catch (error) {
-        const errorPayload = {
-            cause: "Uncaught exception in `beforeEach`.",
-            currentPage: from?.name,
-            nextPage: to?.name,
-        };
-
-        console.log(error);
-
-        bailout(errorPayload);
-        return;
-    }
-}
diff --git a/src/router/a-rewrite/methods/error.js b/src/router/a-rewrite/methods/error.js
deleted file mode 100644
index 3c50c1768..000000000
--- a/src/router/a-rewrite/methods/error.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import router from "@/router/a-rewrite";
-
-export async function bailout(errorPayload, forceRestart = false) {
-    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-
-    if (forceRestart) {
-        router.push({
-            name: routeData.RESTART.name,
-        });
-    } else {
-        router.push({
-            name: routeData.ERROR.name,
-        });
-    }
-}
diff --git a/src/router/a-rewrite/methods/get-route.js b/src/router/a-rewrite/methods/get-route.js
deleted file mode 100644
index ead89eb5b..000000000
--- a/src/router/a-rewrite/methods/get-route.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import router from "@/router/a-rewrite";
-
-export function getRoute(pageName) {
-    return router.getRoutes().find((r) => r.name === pageName);
-}
diff --git a/src/router/a-rewrite/methods/navigate-external.js b/src/router/a-rewrite/methods/navigate-external.js
deleted file mode 100644
index 622bf1e99..000000000
--- a/src/router/a-rewrite/methods/navigate-external.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export function navigateToExternalUrl(url, optionalQuery = {}) {
-    // possibly show some loading screen in the future here.
-    var externalUrl = new URL(url);
-
-    for (const queryKey in optionalQuery) {
-        externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
-    }
-
-    window.location.assign(externalUrl);
-}
diff --git a/src/router/a-rewrite/methods/navigate.js b/src/router/a-rewrite/methods/navigate.js
deleted file mode 100644
index ca8de4784..000000000
--- a/src/router/a-rewrite/methods/navigate.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { saveSession } from "@/helpers/heritage-integration/order-helper";
-import { buildManualUrl } from "@/router/a-rewrite/methods/helpers/build-manual-url";
-import { getDestination } from "@/router/a-rewrite/methods/helpers/get-destination";
-import { savePageData } from "@/router/a-rewrite/methods/helpers/save-page-data";
-import router from "@/router/a-rewrite";
-
-import { bailout } from "@/router/a-rewrite/methods/error";
-
-async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
-    console.log(`Navigate:\n
-        - scenario: ${scenario}\n
-        - currentPage: ${currentPageName}\n
-        - withSaving: ${withSaving}\n
-        - forceTopLevelNav: ${forceTopLevelNav}`);
-    
-    // Check to see if calling page is same as current page.
-    // If not, cancel navigation before it begins.
-    const callingRoute = currentPageName;
-    const actualRoute = router.currentRoute.value.name;
-
-    if (callingRoute !== actualRoute) {
-        return false;
-    }
-
-    const nextPage = getDestination(currentPageName, scenario);
-
-    if (!nextPage) {
-        console.error(
-            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
-        );
-
-        const errorPayload = {
-            cause: "invalid page name",
-            currentPage: currentPageName,
-            nextPage: nextPage?.name,
-        };
-
-        bailout(errorPayload);
-        return;
-    }
-
-    if (withSaving) {
-        await saveSession({ pageNameToLog: nextPage.name });
-    }
-
-    // Some pages require manually setting the next url
-    // to work with iframes.
-    if (forceTopLevelNav) {
-        const newUrl = buildManualUrl(nextPage);
-        window.top.location.href = newUrl;
-        return;
-    }
-
-    // All other pages use router.push
-    router.push({
-        name: nextPage.name,
-        query: nextPage.params ?? {},
-    });
-}
-
-//// -- Aliases: what's actually called
-
-export async function navigateWithoutSaving(scenario, currentPageName) {
-    return await navigate(scenario, currentPageName, false);
-}
-
-export async function navigateWithSaving(scenario, currentPageName) {
-    return await navigate(scenario, currentPageName, true);
-}
-
-export async function navigateWithPageData(scenario, currentPageName, pageData = {}) {
-    const nextPage = getDestination(currentPageName, scenario);
-    await savePageData(nextPage.name, pageData);
-
-    return await navigate(scenario, currentPageName, true);
-}
-
-export async function navigateAndForceTopLevelNavigation(
-    scenario,
-    currentPageName,
-    saving = false
-) {
-    return await navigate(scenario, currentPageName, saving, true);
-}
diff --git a/src/router/a-rewrite/methods/page-prerequisites.js b/src/router/a-rewrite/methods/page-prerequisites.js
deleted file mode 100644
index 581ab0354..000000000
--- a/src/router/a-rewrite/methods/page-prerequisites.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { getRoute } from "@/router/a-rewrite/methods/get-route";
-
-export async function checkPagePrerequisites(pageName) {
-    const route = getRoute(pageName);
-
-    if (!route) {
-        return false;
-    }
-
-    let component = route.components;
-
-    // Virtual routes have no component, so skip check.
-    if (!component) {
-        return true;
-    }
-
-    if (component?.default?.methods === undefined) {
-        component = await component?.default();
-    }
-
-    return component?.default?.methods?.arePagePrerequisitesValid();
-}
diff --git a/src/router/a-rewrite/methods/route-logic/auto-route.js b/src/router/a-rewrite/methods/route-logic/auto-route.js
deleted file mode 100644
index a6d55e4fa..000000000
--- a/src/router/a-rewrite/methods/route-logic/auto-route.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
-
-export async function autoRouteBeforeEnter(to, from) {
-    for (let i = 0; i < autoRouteTable.length; i++) {
-        const testRouteData = autoRouteTable[i];
-
-        const isReady = await checkPagePrerequisites(testRouteData.name);
-
-        if (isReady) {
-            return {
-                name: testRouteData.name,
-                replace: true,
-            };
-        }
-    }
-
-    return {
-        name: FUNNEL_START_PAGE,
-        replace: true,
-    };
-}
diff --git a/src/router/a-rewrite/methods/route-logic/error.js b/src/router/a-rewrite/methods/route-logic/error.js
deleted file mode 100644
index c4bdeb6d5..000000000
--- a/src/router/a-rewrite/methods/route-logic/error.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { globalEvents, globalEventTypes } from "@/constants/events";
-import { storeActions } from "@/constants/store-actions";
-import eventBus from "@/helpers/event-bus/event-bus";
-import baseMixin from "@/mixins/base-mixin";
-import router from "@/router/a-rewrite";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import store from "@/store";
-
-export async function errorBeforeEnter(to, from) {
-    // If we've already encountered one error, clear session to avoid more.
-    // Otherwise mark that we encoutnered an error here.
-    if (store.getters.applicationUser.hasAlreadyTriggeredError) {
-        return {
-            name: routeData.RESTART.name,
-            replace: true,
-        };
-    } else {
-        await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
-    }
-
-    // Add error event to bus
-    eventBus.addEventToBus(
-        globalEvents.Categories.GLOBAL_ALERT,
-        globalEvents.SubCategories.UNKNOWN_ERROR,
-        {
-            isDismissable: true,
-            messageCopy: "",
-            messageHeadline: "We're sorry, something went wrong.",
-            type: globalEventTypes.Danger,
-        }
-    );
-
-    let nextPage = FUNNEL_START_PAGE.name;
-
-    baseMixin.methods?.ResetExternalParamsAndHideModal();
-
-    if (store.getters.payment?.insuranceCoverage?.isVerified) {
-        nextPage = routeData.VEHICLE_DAMAGE.name;
-    }
-
-    if (from.name === nextPage) {
-        // Router won't load the page if we redirect to the already existing page
-        // Force refresh in this scenario.
-        router.go(0);
-        return false;
-    }
-
-    return {
-        name: nextPage,
-        replace: false,
-    };
-}
diff --git a/src/router/a-rewrite/methods/route-logic/heritage.js b/src/router/a-rewrite/methods/route-logic/heritage.js
deleted file mode 100644
index d1a4c41c4..000000000
--- a/src/router/a-rewrite/methods/route-logic/heritage.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-
-export async function heritageBeforeEnter(to, from) {
-    await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
-}
diff --git a/src/router/a-rewrite/methods/route-logic/insurance-company.js b/src/router/a-rewrite/methods/route-logic/insurance-company.js
deleted file mode 100644
index 18d961854..000000000
--- a/src/router/a-rewrite/methods/route-logic/insurance-company.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
-
-export async function insuranceCompanyBeforeEnter(to, from) {
-    if (isVerifiedInsurance()) {
-        return {
-            name: routeData.HERITAGE.name,
-            replace: true,
-        };
-    }
-}
diff --git a/src/router/a-rewrite/methods/route-logic/landing.js b/src/router/a-rewrite/methods/route-logic/landing.js
deleted file mode 100644
index b71d7a9db..000000000
--- a/src/router/a-rewrite/methods/route-logic/landing.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import router from "@/router/a-rewrite";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { consumeReferralQuerystrings } from "@/router/a-rewrite/methods/helpers/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/a-rewrite/methods/helpers/initialize-from-querystrings";
-import { stashAllQueries } from "@/router/a-rewrite/methods/helpers/querystring-stash";
-import store from "@/store";
-
-export async function landingBeforeEnter(to, from) {
-    await initializeFromQueryStrings();
-    // Save querystrings to temporary stash so they can be referred to later.
-    stashAllQueries(to);
-    // Change referral info. For use in local testing for insurance crossover.
-    await consumeReferralQuerystrings();
-
-    // Check for fmgpage parameter
-    const fmgPage = to?.query?.fmgPage;
-    if (fmgPage && router.hasRoute(fmgPage)) {
-        return {
-            name: fmgPage,
-            replace: true,
-        };
-    }
-
-    // If a session is still in memory, go to return-user.
-    if (store.getters.vehicle?.year > 0) {
-        console.log(`trying to redirect!`);
-        return {
-            name: routeData.RETURN_USER.name,
-            replace: true,
-        };
-    }
-
-    // Otherwise, load session and auto-route
-    return {
-        name: routeData.LOAD_SESSION.name,
-        replace: true,
-    };
-}
diff --git a/src/router/a-rewrite/methods/route-logic/load-session.js b/src/router/a-rewrite/methods/route-logic/load-session.js
deleted file mode 100644
index c70eb28d6..000000000
--- a/src/router/a-rewrite/methods/route-logic/load-session.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-
-export async function loadSessionBeforeEnter(to, from) {
-    const loadSessionResponse = await loadSessionIfPresent(false, to.name);
-
-    return {
-        name: routeData.AUTO_ROUTE.name,
-        replace: true,
-    };
-}
diff --git a/src/router/a-rewrite/methods/route-logic/quote.js b/src/router/a-rewrite/methods/route-logic/quote.js
deleted file mode 100644
index 9771b9bbb..000000000
--- a/src/router/a-rewrite/methods/route-logic/quote.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { queryStrings } from "@/constants/query-strings";
-import { storeMutations } from "@/constants/store-mutations";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
-import store from "@/store";
-
-export async function quoteBeforeEnter(to, from) {
-    if (isVerifiedInsurance()) {
-        return {
-            name: routeData.HERITAGE.name,
-            replace: true,
-        };
-    }
-
-    const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
-
-    if (offerQuote === "true") {
-        store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
-    }
-}
diff --git a/src/router/a-rewrite/methods/route-logic/restart.js b/src/router/a-rewrite/methods/route-logic/restart.js
deleted file mode 100644
index 4589999e0..000000000
--- a/src/router/a-rewrite/methods/route-logic/restart.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { storeActions } from "@/constants/store-actions";
-import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import router from "@/router/a-rewrite";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import store from "@/store";
-
-export async function restartBeforeEnter(to, from) {
-    await store.dispatch(storeActions.RESET_STATE);
-    deleteFunnelCookie();
-
-    if (from.name === FUNNEL_START_PAGE.name) {
-        // Router won't load the page if we redirect to the already existing page
-        // Force refresh in this scenario.
-        router.go(0);
-        return false;
-    }
-
-    return {
-        name: FUNNEL_START_PAGE.name,
-        replace: true,
-    };
-}
diff --git a/src/router/a-rewrite/methods/route-logic/vehicle.js b/src/router/a-rewrite/methods/route-logic/vehicle.js
deleted file mode 100644
index ed241d7de..000000000
--- a/src/router/a-rewrite/methods/route-logic/vehicle.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { storeMutations } from "@/constants/store-mutations";
-import { getBoolFromString } from "@/helpers/boolean-helper";
-import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
-import store from "@/store";
-
-export async function vehicleBeforeEnter(to, from) {
-    // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
-    const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
-    if (hasVehicleChanged) {
-        store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
-    }
-
-    if (isVerifiedInsurance()) {
-        return {
-            name: routeData.VEHICLE_DAMAGE.name,
-            replace: true,
-        };
-    }
-}
diff --git a/src/router/a-rewrite/methods/routes.js b/src/router/a-rewrite/methods/routes.js
deleted file mode 100644
index 5cbc8e94e..000000000
--- a/src/router/a-rewrite/methods/routes.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { createRoute, createVirtualRoute } from "@/router/a-rewrite/methods/helpers/create-route";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-
-import { vehicleBeforeEnter } from "@/router/a-rewrite/methods/route-logic/vehicle";
-import { quoteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/quote";
-import { insuranceCompanyBeforeEnter } from "@/router/a-rewrite/methods/route-logic/insurance-company";
-import { landingBeforeEnter } from "@/router/a-rewrite/methods/route-logic/landing";
-import { heritageBeforeEnter } from "@/router/a-rewrite/methods/route-logic/heritage";
-import { loadSessionBeforeEnter } from "@/router/a-rewrite/methods/route-logic/load-session";
-import { autoRouteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/auto-route";
-import { errorBeforeEnter } from "@/router/a-rewrite/methods/route-logic/error";
-import { restartBeforeEnter } from "@/router/a-rewrite/methods/route-logic/restart";
-
-export const routes = [
-    // Non-virtual pages.
-    createRoute(routeData.VEHICLE, vehicleBeforeEnter),
-    createRoute(routeData.VEHICLE_DAMAGE),
-    createRoute(routeData.ESTIMATE),
-    createRoute(routeData.ADDRESS_LOOKUP),
-    createRoute(routeData.VIN_LOOKUP),
-    createRoute(routeData.LICENSE_PLATE_LOOKUP),
-    createRoute(routeData.SERVICE_ZIP),
-    createRoute(routeData.ADDRESS_VEHICLES),
-    createRoute(routeData.VEHICLE_PARTS),
-    createRoute(routeData.PART_QUESTIONS),
-    createRoute(routeData.MOLDING_QUESTIONS),
-    createRoute(routeData.CAPABILITY_QUESTIONS),
-    createRoute(routeData.QUOTE, quoteBeforeEnter),
-    createRoute(routeData.INSURANCE_COMPANY, insuranceCompanyBeforeEnter),
-    createRoute(routeData.SERVICE_LOCATION),
-    createRoute(routeData.SCHEDULE),
-    createRoute(routeData.CUSTOMER_DETAILS),
-    createRoute(routeData.PAYMENT_METHOD),
-    createRoute(routeData.PAYMENT),
-    createRoute(routeData.PAYMENT_PIA_RETURN),
-    createRoute(routeData.CONFIRMATION),
-    createRoute(routeData.RETURN_USER),
-
-    // Virtual pages (resolve to a non-virtual page.)
-    createVirtualRoute(routeData.LANDING, landingBeforeEnter),
-    createVirtualRoute(routeData.HERITAGE, heritageBeforeEnter),
-    createVirtualRoute(routeData.LOAD_SESSION, loadSessionBeforeEnter),
-    createVirtualRoute(routeData.AUTO_ROUTE, autoRouteBeforeEnter),
-    createVirtualRoute(routeData.ERROR, errorBeforeEnter),
-    createVirtualRoute(routeData.RESTART, restartBeforeEnter),
-];

From 92955e34a1ea689580efbddd2ef96c64d27fbfd1 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 13 May 2025 14:38:26 -0400
Subject: [PATCH 48/64] CASH-429 style updates for calendar.

---
 src/digital-components/date-picker/date-picker.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 1a7df91e0..b23ccece2 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -1042,6 +1042,9 @@ export default {
                         min-width: 3rem;
                         width: 3rem;
                     }
+                    &:hover {
+                        border: 2px solid $blue;
+                    }
                 }
             }
             &.unavailable-day {
@@ -1083,7 +1086,6 @@ export default {
                 }
                 input[type="radio"]:checked + label:after {
                     background-color: $black;
-                    top: 2rem;
                 }
             }
         }

From ac3df43577426804f64ed0ea7d1cdd43d7be1041 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 14:42:50 -0400
Subject: [PATCH 49/64] Revert "Omnibus"

This reverts commit 3eae075f6eac6c338838bd76758349be91c3571c.
---
 src/App.vue                                   |   3 -
 src/constants/application-config.js           |  19 +-
 src/constants/store-actions.js                |   1 -
 src/constants/store-mutations.js              |   1 -
 .../text-block/text-block.vue                 |   2 +-
 .../progress-bar/progress-bar.vue             |   2 +-
 src/global-methods.js                         |   4 +-
 .../heritage-integration/order-helper.js      |  26 +-
 src/layouts/address-lookup/address-lookup.vue |  17 +-
 .../address-vehicles/address-vehicles.vue     |  11 +-
 src/layouts/bailout/bailout.vue               |   2 +-
 .../capability-questions.vue                  |   2 +-
 src/layouts/confirmation/confirmation.vue     |  15 +-
 .../customer-details/customer-details.vue     |  15 +-
 src/layouts/estimate/estimate.vue             |  22 +-
 .../insurance-company/insurance-company.vue   |  15 +-
 .../license-plate-lookup.vue                  |  16 +-
 .../molding-questions/molding-questions.vue   |   2 +-
 src/layouts/part-questions/part-questions.vue |   2 +-
 src/layouts/payment-method/payment-method.vue |  29 +-
 .../payment-pia-return/payment-pia-return.vue |  47 +-
 src/layouts/payment/payment.vue               |  32 +-
 src/layouts/quote/quote.vue                   |  27 +-
 src/layouts/return-user/return-user.vue       |  10 +-
 src/layouts/schedule/schedule.vue             |  12 +-
 .../service-location/service-location.vue     |   9 +-
 src/layouts/service-zip/service-zip.vue       |  11 +-
 src/layouts/vehicle-damage/vehicle-damage.vue |  37 +-
 .../glass-part-question.vue                   |   2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue   |   2 +-
 src/layouts/vehicle/vehicle.vue               |  15 +-
 src/layouts/vin-lookup/vin-lookup.vue         |  14 +-
 src/main.js                                   |   2 +-
 src/mixins/base-mixin.js                      |   9 +-
 src/mixins/vehicle-questions-mixin.js         |  36 +-
 .../a-rewrite/constants/auto-route-table.js   |  13 -
 .../constants/navigation-scenarios.js         |  69 --
 .../a-rewrite/constants/route-prefix.js       |   3 -
 src/router/a-rewrite/constants/routes.js      | 123 ----
 .../a-rewrite/constants/routing-table.js      | 596 ------------------
 src/router/a-rewrite/index.js                 | 421 -------------
 .../a-rewrite/logic/build-manual-url.js       |  27 -
 .../a-rewrite/logic/consume-referral-info.js  |  18 -
 src/router/a-rewrite/logic/create-route.js    |  39 --
 src/router/a-rewrite/logic/get-destination.js |  18 -
 .../logic/initialize-from-querystrings.js     | 121 ----
 .../a-rewrite/logic/lazy-load-component.js    |   3 -
 .../a-rewrite/logic/querystring-stash.js      |  58 --
 .../logic/requires-verified-redirect.js       |   8 -
 src/router/a-rewrite/logic/run-experiments.js |  30 -
 src/router/a-rewrite/logic/save-page-data.js  |  11 -
 src/store/index.js                            |   8 -
 52 files changed, 221 insertions(+), 1816 deletions(-)
 delete mode 100644 src/router/a-rewrite/constants/auto-route-table.js
 delete mode 100644 src/router/a-rewrite/constants/navigation-scenarios.js
 delete mode 100644 src/router/a-rewrite/constants/route-prefix.js
 delete mode 100644 src/router/a-rewrite/constants/routes.js
 delete mode 100644 src/router/a-rewrite/constants/routing-table.js
 delete mode 100644 src/router/a-rewrite/index.js
 delete mode 100644 src/router/a-rewrite/logic/build-manual-url.js
 delete mode 100644 src/router/a-rewrite/logic/consume-referral-info.js
 delete mode 100644 src/router/a-rewrite/logic/create-route.js
 delete mode 100644 src/router/a-rewrite/logic/get-destination.js
 delete mode 100644 src/router/a-rewrite/logic/initialize-from-querystrings.js
 delete mode 100644 src/router/a-rewrite/logic/lazy-load-component.js
 delete mode 100644 src/router/a-rewrite/logic/querystring-stash.js
 delete mode 100644 src/router/a-rewrite/logic/requires-verified-redirect.js
 delete mode 100644 src/router/a-rewrite/logic/run-experiments.js
 delete mode 100644 src/router/a-rewrite/logic/save-page-data.js

diff --git a/src/App.vue b/src/App.vue
index f4c5754aa..422ae2893 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,9 +36,6 @@ export default {
         loadingModal,
         funnelFooter,
     },
-    mounted() {
-        showFmgLoadingModal(true);
-    },
 };
 
 // Add a global Javascript exception handler for logging exceptions, this handler will log when there is an uncaught exception
diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index a03e5f010..14f195cfc 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -15,12 +15,21 @@ const applicationConfig = {
     CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER: "87291",
     MY_ACCOUNT: process.env.VUE_APP_MY_ACCOUNT,
     PIA_RESPONSE_URL:
-        location.protocol + "//" + location.host + "/fmg/payment-pia-return?src=concept-funnel",
+        location.protocol +
+        "//" +
+        location.host +
+        "/fmg/?fmgPage=payment-pia-return&src=concept-funnel",
     PIA_CANCEL_URL:
-        location.protocol + "//" + location.host + "/fmg/payment-method?src=concept-funnel",
+        location.protocol +
+        "//" +
+        location.host +
+        "/fmg/?fmgPage=payment-method&src=concept-funnel",
     PIA_ERROR_URL:
-        location.protocol + "//" + location.host + "/fmg/payment-pia-return?src=concept-funnel",
-    CONFIRMATION_URL: location.protocol + "//" + location.host + "/fmg/confirmation",
+        location.protocol +
+        "//" +
+        location.host +
+        "/fmg/?fmgPage=payment-pia-return&src=concept-funnel",
+    CONFIRMATION_URL: location.protocol + "//" + location.host + "/fmg/?fmgPage=confirmation",
     GOOGLE_CALENDAR: "https://www.google.com/calendar/render?action=TEMPLATE",
     YAHOO_CALENDAR: "https://calendar.yahoo.com/?v=60",
     OUTLOOK_CALENDAR:
@@ -29,7 +38,7 @@ const applicationConfig = {
     AFFILIATE_COOKIE_CONTAINING_NAME: "_Track",
     COOKIE_NAME_LENGTH_MAX_LIMIT: 44,
     SESSION_TIMEOUT_MINUTES: process.env.VUE_APP_SESSION_TIMEOUT_MINUTES,
-    RETURN_USER_PAGE: "/fmg/return-user",
+    RETURN_USER_PAGE: "/fmg/?fmgPage=return-user",
 };
 
 export { applicationConfig };
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 9f0965480..7b76d4064 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -117,7 +117,6 @@ const storeActions = {
     UPDATE_EXTERNAL_PARAMETER_MMS: "updateExternalParameterMMS",
 
     SAVE_LOGGING_OPTION: "saveLoggingOption",
-    UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index f7e8d9f4b..5064864d0 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -94,7 +94,6 @@ const storeMutations = {
     UPDATE_SAVE_SESSION_PROMISE: "updateSaveSessionPromise",
     UPDATE_LAST_PAGE_VISITED: "updateLastPageVisited",
     UPDATE_LOGGING_OPTION: "updateLoggingOption",
-    UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
 
     // EXPERIMENT MUTATIONS
     UPDATE_EXPERIMENTS: "updateExperiments",
diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index c7bb61215..b84f12283 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -58,7 +58,7 @@ export default {
         getRouterLinkDisplayTextFromCopy,
         getExternalLink,
         navigateWithScenario(scenarioName) {
-            this.$router.navigateWithoutSaving(scenarioName, this.pageName);
+            this.$router.navigateWithoutSaving(scenarioName, this.$route);
         },
     },
     computed: {
diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index da370e415..ab6a00b3a 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -17,7 +17,7 @@ export default {
     },
     methods: {
         getProgress() {
-            var pageName = this.pageName;
+            var pageName = store.getters.applicationUser.lastPageVisited;
             return getProgressBarPercentage(pageName);
         },
     },
diff --git a/src/global-methods.js b/src/global-methods.js
index 784ba6782..ba6cec1ec 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import router from "@/router/a-rewrite";
+import router from "@/router";
 import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
@@ -117,7 +117,7 @@ export default {
                             endpoint: endpoint,
                         };
 
-                        router.bailout(errorPayload);
+                        router.navigateError(errorPayload);
 
                         // do not log 404 errors from services because we return NotFound
                         // when a service doesn't return an object
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 1c0922ba0..76729e49f 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -59,15 +59,25 @@ export async function saveSession({
     submitAfterSave = false,
     createUnscheduledStatusWorkOrderForPIA = false,
 }) {
-    // Add next save session to end of queue
-    const saveSessionPromise = flushSaveSessionQueue().then(() => {
-        return saveSessionHelper(
+    var saveSessionPromise;
+    if (store.getters.applicationUser.saveSessionPromise) {
+        // queue newest request after current saveSessionPromise resolves
+        saveSessionPromise = store.getters.applicationUser.saveSessionPromise.then(() => {
+            // get a new saveSessionPromise
+            return saveSessionHelper(
+                pageNameToLog,
+                submitAfterSave,
+                createUnscheduledStatusWorkOrderForPIA
+            );
+        });
+    } else {
+        // create an initial saveSessionPromise
+        saveSessionPromise = saveSessionHelper(
             pageNameToLog,
             submitAfterSave,
             createUnscheduledStatusWorkOrderForPIA
         );
-    });
-
+    }
     store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise);
     // await here to allow for a caller to await and make the function synchronous
     if (!store.getters.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
@@ -123,7 +133,7 @@ async function loadSession(
     pageNameToLog
 ) {
     // await the saveSessionPromise in the store to make sure we're loading up to date information
-    await flushSaveSessionQueue();
+    await store.getters.applicationUser.saveSessionPromise;
 
     const response = await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.LOAD_SESSION,
@@ -183,7 +193,3 @@ async function saveSessionHelper(
     // Update the cookie with the referral information when saved.
     updateOrCreateFunnelCookie();
 }
-
-export async function flushSaveSessionQueue() {
-    return Promise.resolve(store.getters.applicationUser.saveSessionPromise);
-}
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 6a82ea26c..54020b7b0 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -137,7 +137,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -193,10 +193,7 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
@@ -445,14 +442,18 @@ export default {
             ) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
                 );
             } else if (matchingCars.length === 1) {
                 await this.navigateForwardWithSingleCarMatch();
             } else {
-                this.$router.navigateWithPageData(
+                this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                    this.pageName,
+                    this.$route,
+                    {},
+                    {},
                     carsFound
                 );
             }
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index e094f6147..f44cdc65a 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -82,7 +82,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -166,10 +166,7 @@ export default {
             return false;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
             const vinLookup = await this.dispatchStoreActionWithLogging(
@@ -208,7 +205,9 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index a64f7a416..b1f159fbe 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -37,7 +37,7 @@ export default {
     name: "bailout",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index e04f0f18e..1896513a1 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index e65eacc3c..40736b2c2 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -123,7 +123,6 @@ import experimentMixin from "@/mixins/experiment-mixin.js";
 import { containsRecalParts } from "@/helpers/recal-helper.js";
 import donationBlock from "@/experiment-components/donation-block.vue";
 import { partNumberStrings } from "@/constants/part-number-strings";
-import analyticsMixin from "@/mixins/analytics-mixin";
 
 export default {
     name: "confirmation",
@@ -180,7 +179,7 @@ export default {
 
         // Call APIs
         const submittedOrder = baseMixin.methods.getSubmittedOrder();
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_WIPERS,
@@ -245,8 +244,6 @@ export default {
             vm.showDonationSuccess = lineItemsFromSubmittedOrder.supportingItems?.some(
                 (item) => item.partType === partNumberStrings.DONATION
             );
-
-            vm.pushAnalytics();
         });
     },
     data() {
@@ -559,16 +556,6 @@ export default {
                 this.$refs.donationBlock.removeLoader();
             }
         },
-        pushAnalytics() {
-            //Push Ecommerce Cart to Data Layer
-            analyticsMixin.methods.pushECommerceCartToDataLayer();
-
-            //Push Product Array to Data Layer
-            analyticsMixin.methods.pushProductArrayToDataLayer();
-
-            //Push Commission Junction Gtm Data To Data Layer
-            analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
-        },
     },
     components: {
         funnelHeader,
diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue
index 8cb17673b..baa8636be 100644
--- a/src/layouts/customer-details/customer-details.vue
+++ b/src/layouts/customer-details/customer-details.vue
@@ -84,7 +84,6 @@ import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import store from "@/store";
 import { paymentMethods } from "@/constants/payment-method-constants";
-import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
@@ -103,7 +102,7 @@ export default {
     name: "customer-details",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -158,10 +157,7 @@ export default {
             return store.getters.order.serviceLocation.techNotes;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
             this.dispatchStoreAction(
@@ -190,13 +186,10 @@ export default {
                     paymentMethods.NONE,
                     false
                 );
-                await flushSaveSessionQueue();
+                await store.getters.applicationUser.saveSessionPromise;
             }
 
-            this.$router.navigateWithSaving(
-                this.navigationScenarios.CLICKED_FORWARD,
-                this.pageName
-            );
+            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
         },
     },
     components: {
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 0a5db7d74..b9fdf1958 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,6 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -90,7 +89,7 @@ export default {
 
     async beforeRouteEnter(to, from, next) {
         //Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const queryString = window.location.search;
         const urlParams = new URLSearchParams(queryString);
@@ -99,9 +98,9 @@ export default {
             lowerCaseParams.append(name.toLowerCase(), value);
         }
 
-        const zip =
-            consumeQueryFromStash(queryStrings.ZIP_CODE) ??
-            store.getters.order.serviceLocation.zipCode;
+        const zip = lowerCaseParams.get(queryStrings.ZIP_CODE)
+            ? lowerCaseParams.get(queryStrings.ZIP_CODE)
+            : store.getters.order.serviceLocation.zipCode;
 
         var vinByAddressPromise;
         if (zip) {
@@ -185,35 +184,32 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.MANUALVIN) {
                 await this.dispatchStoreAction(storeActions.CLEAR_VIN);
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_MANUAL_VIN,
-                    this.pageName
+                    this.$route
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.LICENSEPLATE) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_LICENSE_PLATE,
-                    this.pageName
+                    this.$route
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.HOMEADDRESS) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_HOME_ADDRESS,
-                    this.pageName
+                    this.$route
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.DECLINE) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_NO_VIN,
-                    this.pageName
+                    this.$route
                 );
             }
         },
diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 7efde9a68..c9409eb71 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -58,7 +58,6 @@ import { experimentSettings } from "@/constants/experiments";
 import { partNumberStrings } from "@/constants/part-number-strings";
 import { deepClone } from "@/helpers/object-helper";
 import store from "@/store";
-import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 
 export default {
     name: "insurance-company",
@@ -82,7 +81,7 @@ export default {
         }
 
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         const insuranceCompanyListPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_INSURANCE_COMPANY_LIST,
             {},
@@ -147,20 +146,18 @@ export default {
             // Go back to Quote page
             if (forceCashSelectionOnQuote) {
                 this.$router.navigateWithoutSaving(
-                    this.navigationScenarios.CLICKED_PAY_ON_MY_OWN,
-                    this.pageName
+                    this.navigationScenarios.CLICKED_BACK,
+                    this.$route,
+                    { isCashSelected: true }
                 );
                 return;
             }
 
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
             // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
-            await flushSaveSessionQueue();
+            await store.getters.applicationUser.saveSessionPromise;
 
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index a6bb07bab..223ca9ee7 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -119,8 +119,6 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
-import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
 defineRule("license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED));
@@ -140,7 +138,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -165,8 +163,7 @@ export default {
     data() {
         return {
             licensePlate: this.getLicensePlateFromStore(),
-            registrationZipCode:
-                this.getRegistrationZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
+            registrationZipCode: this.getRegistrationZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
             serviceZipCode: this.getServiceZipFromStore(),
             carId: this.getCarIdfromStore(),
@@ -190,10 +187,7 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
@@ -398,7 +392,9 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 82b1e1619..2c5f5a7c3 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 89568fa37..1d7771474 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index d07434c1f..d5c7d93c3 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,7 +168,6 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -180,7 +179,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const lineItemsFromStore = deepClone(store.getters.order.lineItems);
 
@@ -282,7 +281,7 @@ export default {
         const oldActivePromos = store.getters.lineItems.promos?.slice(0);
         const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
-        const promoCodeFromQueryString = consumeQueryFromStash(queryStrings.PROMO);
+        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
@@ -375,7 +374,7 @@ export default {
         doesCopyContainRouterLink,
         getRouterLinkRouteFromCopy,
         navigateWithScenario(scenarioName) {
-            this.$router.navigateWithoutSaving(scenarioName, this.pageName);
+            this.$router.navigateWithoutSaving(scenarioName, this.$route);
         },
         arePagePrerequisitesValid() {
             // Service Location
@@ -538,10 +537,7 @@ export default {
             return this.$store.getters.order.isRecalAckOptIn;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
             this.forwardClicked = true;
@@ -579,14 +575,16 @@ export default {
                 await submitWorkOrder({ pageNameToLog: "payment-method", submitAfterSave: true });
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_PIA_ALERT]: false }
                 );
             } else {
                 if (this.paymentMethod == paymentMethods.INSURANCE) {
                     this.dispatchStoreAction(this.storeActions.SAVE_PAYMENT_TYPE, true, false);
                     return this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_INSURANCE,
-                        this.pageName
+                        this.$route
                     );
                 } else {
                     this.setupPia();
@@ -605,14 +603,16 @@ export default {
             } catch (error) {
                 console.log("error: response from pia submit work order:" + error.message);
                 this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-                this.$route.query.piaError = true;
+                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] = true;
                 return;
             }
 
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_PAY_NOW,
-                this.pageName
+                this.$route,
+                {},
+                { [routerParams.DISPLAY_PIA_ALERT]: false }
             );
         },
         hasSubmittedOrder() {
@@ -797,7 +797,10 @@ export default {
             return this.paymentMethodInternalModel;
         },
         shouldDisplayPiaAlert() {
-            return getBoolFromString(this.$route?.query?.piaError);
+            return (
+                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] ||
+                getBoolFromString(window.history.state.displayPiaAlert)
+            );
         },
         // Necessary to make the watcher of lineItems work
         // JavaScript does not keep a record of the old value, only a reference to it's location in the memory.
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index b39726948..f0b4433ea 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -39,22 +39,20 @@ export default {
                 store.getters.order.payment.piaType === paymentMethods.APPLE_PAY ||
                 store.getters.order.payment.piaType === paymentMethods.AFTERPAY;
             if (paymentPageNavScenario) {
-                const scenarios = {
-                    [paymentMethods.CREDIT_CARD]: this.navigationScenarios.PIA_CC_ERROR,
-                    [paymentMethods.APPLE_PAY]: this.navigationScenarios.PIA_APPLE_ERROR,
-                    [paymentMethods.AFTERPAY]: this.navigationScenarios.PIA_AFTERPAY_ERROR,
-                };
-
-                const relevantScenario = scenarios[store.getters.order.payment.piaType];
-
-                await this.$router.navigateAndForceTopLevelNavigation(
-                    relevantScenario,
-                    this.pageName
+                this.$router.navigateWithoutSaving(
+                    this.navigationScenarios.PIA_CC_ERROR,
+                    this.$route,
+                    {
+                        [queryStrings.DISPLAY_PIA_ALERT]: store.getters.order.payment.piaType,
+                    }
                 );
             } else {
-                await this.$router.navigateAndForceTopLevelNavigation(
+                this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName
+                    this.$route,
+                    {
+                        [queryStrings.DISPLAY_PIA_ALERT]: true,
+                    }
                 );
             }
         } else {
@@ -86,9 +84,11 @@ export default {
                     } else {
                         var msg = "Unknown Pia type: " + store.getters.order.payment.piaType;
                         console.log(msg);
-                        await this.$router.navigateAndForceTopLevelNavigation(
+                        this.$router.navigateWithoutSaving(
                             this.navigationScenarios.PIA_ERROR,
-                            this.pageName
+                            this.$route,
+                            {},
+                            { [routerParams.DISPLAY_PIA_ALERT]: true }
                         );
                     }
                 }
@@ -123,9 +123,11 @@ export default {
                         " " +
                         store.getters.order.referralSequenceNumber
                 );
-                this.$router.navigateAndForceTopLevelNavigation(
+                this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_PIA_ALERT]: true }
                 );
             } else {
                 const expMonth = getQuerystringParameter(queryStrings.CARD_EXPIRATION_MONTH);
@@ -179,9 +181,11 @@ export default {
                 });
             } catch (error) {
                 console.log("error: response from submit work order:" + error.message);
-                this.$router.navigateAndForceTopLevelNavigation(
+                this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_PIA_ALERT]: true }
                 );
                 this.$refs.loadingModal.isModalVisible = false;
                 return;
@@ -189,10 +193,7 @@ export default {
 
             this.$refs.loadingModal.isModalVisible = false;
             await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
-            this.$router.navigateAndForceTopLevelNavigation(
-                this.navigationScenarios.PIA_SUCCESS,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route);
         },
     },
     components: {
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index f2bdb6733..3c87f85f2 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -289,7 +289,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const signaturePromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_SIGNATURE,
@@ -684,16 +684,12 @@ export default {
                 });
 
                 await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
-                this.$router.navigateAndForceTopLevelNavigation(
-                    this.navigationScenarios.CLICKED_PAY_LATER,
-                    this.pageName
-                );
-                //window.location = applicationConfig.CONFIRMATION_URL;
+                window.location = applicationConfig.CONFIRMATION_URL;
             } catch (error) {
                 console.log("error: response from submit work order(payment pg):" + error.message);
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName,
+                    this.$route,
                     {},
                     { [routerParams.DISPLAY_PIA_ALERT]: true }
                 );
@@ -702,13 +698,16 @@ export default {
             }
         },
         backButtonAction() {
-            // Used to set the url directly here.
-            // Now hooks into a shared set of logic for doing this, also used with `payment-pia-return`.
-            // And uses nav scenarios properly.
-            this.$router.navigateAndForceTopLevelNavigation(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            // The only way I could figure out how to get navigation to work on a page with the iframe.
+            // This is also how a cancel from Paypal would work.  Just a redirect to the payment-method page.
+            // The normal navigation sort of works but the page does not render.  The "next" callback function does not get
+            // invoked in payment-method's beforeroute enter.  I also spotted an error in vue-router.esm-bundler.js when this
+            // happens but was unable to ignore it with a try catch.  The navigation guard error is:
+            // Error: Redirected from "/?fmgPage=payment-method" to "{ params: {isSavingNation: "false"}, query: "fmgPage: "payment-method"}"
+            // I don't know if the navigation guard thinks the to and from are the same page.
+            // Also tried overriding with a $router.push
+            window.location = applicationConfig.PIA_CANCEL_URL;
+            //this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         submitHopForm() {
             this.$nextTick(() => {
@@ -805,7 +804,10 @@ export default {
             }
         },
         shouldDisplayPiaAlert(payMethod) {
-            return this.$route?.query?.piaErrorType === payMethod;
+            return (
+                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] === payMethod ||
+                getBoolFromString(window.history.state.displayPiaAlert)
+            );
         },
     },
     components: {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index f100a9f32..663f778c1 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -169,23 +169,17 @@ import {
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
 const INSURANCE_TAB_TO_DISPLAY_THRESHOLD_DEFAULT = 300;
 
-const ACCEPTED_QUOTE_TYPES = {
-    CASH: "cash",
-    INSURANCE: "insurance",
-};
-
 export default {
     name: "quote",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_WIPERS,
             {
@@ -222,7 +216,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.name,
+                    pageName: to.query.fmgPage,
                     experiment: skipQuoteExperiment,
                 },
                 "quote",
@@ -252,7 +246,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.name,
+                    pageName: to.query.fmgPage,
                     experiment: afterpayBreakoutDisplayExperiment,
                 },
                 "quote",
@@ -359,7 +353,7 @@ export default {
         const oldActivePromos = store.getters.lineItems.promos?.slice(0);
         const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
-        const promoCodeFromQueryString = consumeQueryFromStash(queryStrings.PROMO);
+        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
@@ -409,15 +403,10 @@ export default {
             }
 
             const getIsInsuranceSelectedValue = (availableLineItems, insuranceThreshold) => {
-                // Override auto-select if specified
-                const quoteTypeParam = to.query?.offer?.toLowerCase();
-
-                if (quoteTypeParam === ACCEPTED_QUOTE_TYPES.CASH) {
+                // query param checked here is set on insurance-selection "Pay on my own" link click
+                if (to.query?.isCashSelected || to.query?.iscashselected) {
                     return false;
-                } else if (quoteTypeParam === ACCEPTED_QUOTE_TYPES.INSURANCE) {
-                    return true;
                 }
-
                 const serviceLocationState = store.getters.order.serviceLocation.state;
 
                 // usually true when returning from heritage but can be false when returning from heritage on a save quote
@@ -771,12 +760,12 @@ export default {
             if (payment.isInsurance) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    this.pageName
+                    this.$route
                 );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_CASH,
-                    this.pageName
+                    this.$route
                 );
             }
 
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 6b2a36f7e..d655a0c14 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -55,7 +55,7 @@ export default {
     name: "return-user",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         // Settle promises and get results
         const promiseResultMap = [
             {
@@ -85,7 +85,7 @@ export default {
         async forwardButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_FORWARD,
-                this.pageName
+                this.$route
             );
         },
 
@@ -96,9 +96,11 @@ export default {
                 "Start over",
                 true
             );
+            deleteFunnelCookie();
+            await this.dispatchStoreAction(storeActions.RESET_STATE);
             this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_RESTART,
-                this.pageName
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.$route
             );
         },
     },
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b47de1fa8..ae05b9358 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -267,7 +267,7 @@ export default {
         }
 
         // Set up promises
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const alertReasonsPromise = locationAlerts.methods.loadInitialData(
             store.getters.order.serviceLocation.zipCodeCtu,
@@ -536,10 +536,7 @@ export default {
             }
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         forwardButtonAction() {
             this.updateSupportingItems();
@@ -588,10 +585,7 @@ export default {
                 );
             }
 
-            this.$router.navigateWithSaving(
-                this.navigationScenarios.CLICKED_FORWARD,
-                this.pageName
-            );
+            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
         },
         setDisplayWaitList() {
             if (
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 752d0c4c9..3b37c8406 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -219,7 +219,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const zipCodeDataPromise = getZipCodeData(serviceZipCode);
@@ -611,7 +611,7 @@ export default {
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.pageName
+                    this.$route
                 );
             }
         },
@@ -746,10 +746,7 @@ export default {
 
             this.updateAndSaveSupportingItems();
             this.updateAndSaveIsMSRFeeApplicable();
-            this.$router.navigateWithSaving(
-                this.navigationScenarios.CLICKED_FORWARD,
-                this.pageName
-            );
+            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
         },
         setMobileLocationInValid(isMobileLocationInValid) {
             this.isMobileAddressValid = !isMobileLocationInValid;
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 16c6f7f72..ae6ff4ecf 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -96,7 +96,6 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -116,7 +115,7 @@ export default {
     mixins: [vinPagesMixin],
     data() {
         return {
-            serviceZipCode: this.getZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
+            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
             isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
@@ -128,7 +127,7 @@ export default {
 
     async beforeRouteEnter(to, from, next) {
         //Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         //Settle promises and get results
         const promiseResultMap = [
@@ -215,12 +214,12 @@ export default {
             if (skipVin) {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    this.pageName
+                    this.$route
                 );
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.pageName
+                    this.$route
                 );
             }
         },
@@ -318,7 +317,7 @@ export default {
                 await saveSession({ pageNameToLog: "service-zip" });
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    this.pageName
+                    this.$route
                 );
             } else {
                 // if we're skipping the vin-lookup but it's not a repair, we still need to get the parts
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 488ad1eb4..46efb4728 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -110,7 +110,7 @@ export default {
     name: "vehicle-damage",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const damageOptionsPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_DAMAGE_OPTIONS,
@@ -249,10 +249,7 @@ export default {
 
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_BACK,
-                this.pageName
-            );
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
 
         getDamageLocationsFromStore() {
@@ -458,26 +455,34 @@ export default {
                 if (skipVin) {
                     this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                        this.pageName
+                        this.$route,
+                        {},
+                        { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                     );
                 } else {
                     if (store.getters.damage.isRepair) {
                         this.$router.navigateWithSaving(
                             this.navigationScenarios
                                 .CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                            this.pageName
+                            this.$route,
+                            {},
+                            { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                         );
                     } else {
                         if (store.getters.vehicle.vin) {
                             this.$router.navigateWithSaving(
                                 this.navigationScenarios
                                     .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                                this.pageName
+                                this.$route,
+                                {},
+                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                             );
                         } else {
                             this.$router.navigateWithSaving(
                                 this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                                this.pageName
+                                this.$route,
+                                {},
+                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                             );
                         }
                     }
@@ -487,17 +492,23 @@ export default {
             else if (store.getters.vehicle.vin) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                 );
             } else if (skipVin) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                 );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
                 );
             }
         },
@@ -626,7 +637,7 @@ export default {
             );
         },
         shouldDisplayVehicleChangeAlert() {
-            return getBoolFromString(this.$route?.query?.displayVehicleChangeAlert);
+            return getBoolFromString(window.history.state.displayVehicleChangeAlert);
         },
         shouldHideBackButton() {
             return this.$store.getters.requiresVerifiedRedirecting;
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 5f06391c1..280edfc6c 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -154,7 +154,7 @@ export default {
         },
 
         PartDataFromApi() {
-            return this.$store.getters.pageData(this.pageName) ?? {};
+            return this.$store.getters.pageData(this.$route.query.fmgPage) ?? {};
         },
     },
     methods: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 4298b74cb..4b68007f9 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -81,7 +81,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         // Settle promises and get results
         const promiseResultMap = [
             {
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 1d2e7d2bb..bad52fb02 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -110,10 +110,6 @@ import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { applicationConfig } from "../../constants/application-config";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import {
-    consumeQueryFromStash,
-    peekQueryFromStash,
-} from "@/router/a-rewrite/logic/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
@@ -137,7 +133,7 @@ export default {
             imageUrl: this.getImagefromStore(),
             imageVifNumber: this.getImageVifNumberfromStore(),
             imageVifColor: this.getImageVifColorfromStore(),
-            serviceZipCode: this.getZipFromStore() ?? peekQueryFromStash(queryStrings.ZIP_CODE),
+            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             yearOptions: [],
             makeOptions: [],
             modelOptions: [],
@@ -158,7 +154,7 @@ export default {
             );
         }
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         const experimentForLogging = store.getters.applicationUser.experiments.find(
             (e) => e.universeName === experimentUniverses.CONCEPT_FUNNEL
         );
@@ -217,7 +213,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.name,
+                    pageName: to.query.fmgPage,
                     experiment: experimentForLogging,
                 },
                 "vehicle",
@@ -540,10 +536,7 @@ export default {
                 }
             }
 
-            this.$router.navigateWithSaving(
-                this.navigationScenarios.CLICKED_FORWARD,
-                this.pageName
-            );
+            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
         },
         initializeYearComponent(initialData) {
             this.yearOptions = initialData;
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 5db93d76d..23875e3e9 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -160,8 +160,6 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
-import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -182,7 +180,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.name);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -205,7 +203,7 @@ export default {
     data() {
         return {
             vin: this.getVinFromStore(),
-            serviceZipCode: this.getZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
+            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
             isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
@@ -249,12 +247,12 @@ export default {
             if (this.$store.getters.vehicle.vin) {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK_WITH_VIN,
-                    this.pageName
+                    this.$route
                 );
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.pageName
+                    this.$route
                 );
             }
         },
@@ -476,7 +474,9 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    this.pageName
+                    this.$route,
+                    {},
+                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/main.js b/src/main.js
index 5b823125b..1017651f8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import LoadScript from "vue-plugin-load-script";
 import Maska from "maska";
 import App from "./App.vue";
-import router from "./router/a-rewrite";
+import router from "./router";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 import analyticsMixin from "@/mixins/analytics-mixin.js";
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index e39908a8f..b29eae8c1 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -2,7 +2,7 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
 import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
@@ -15,7 +15,6 @@ export default {
     data() {
         return {
             cmsContentByWidget: {},
-            _componentPageName: null,
         };
     },
     methods: {
@@ -247,15 +246,9 @@ export default {
         cssClassNameForCmsWidget() {
             return "widget-name-" + this.cmsWidgetName;
         },
-        pageName() {
-            return this._componentPageName ?? this.$route.name;
-        },
     },
 
     mounted() {
-        // Store route immutably so that components know their originating page even during page transition.
-        this._componentPageName = this.$route.name;
-
         if (!store.getters.externalParameterState?.isExternalParameter) {
             showFmgLoadingModal(false);
         }
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index ab39462ce..517fc7c90 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -65,10 +65,10 @@ export default {
                 orderedVehicleQuestionPages.indexOf(fmgPage)
             );
         },
-        currentPageComesBeforePage(currentPage = this.pageName, fmgPage) {
+        currentPageComesBeforePage(currentPage = this.$route.query.fmgPage, fmgPage) {
             return this.comparePageIndices(currentPage, fmgPage) < 0;
         },
-        currentPageComesAfterPage(currentPage = this.pageName, fmgPage) {
+        currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
             return this.comparePageIndices(currentPage, fmgPage) > 0;
         },
         setupInitialData(glass, index, alreadyAnsweredQuestions, vm) {
@@ -359,7 +359,7 @@ export default {
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
         async navigateForward(partsOrQuestions, vm) {
             const self = vm ?? this;
-            const currentPage = self.pageName;
+            const currentPage = self.$route.query.fmgPage;
 
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
             const hasGlassLocationWithMultipleParts =
@@ -371,9 +371,11 @@ export default {
                 hasPartQuestions &&
                 this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)
             ) {
-                self.$router.navigateWithPageData(
+                self.$router.navigateWithSaving(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    self.pageName,
+                    self.$route,
+                    {},
+                    {},
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -382,9 +384,11 @@ export default {
             ) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData
-                self.$router.navigateWithPageData(
+                self.$router.navigateWithSaving(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    self.pageName,
+                    self.$route,
+                    {},
+                    {},
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -393,9 +397,11 @@ export default {
             ) {
                 // if any childpart questions
                 // go to molding-questions page and pass the partsData
-                self.$router.navigateWithPageData(
+                self.$router.navigateWithSaving(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    self.pageName,
+                    self.$route,
+                    {},
+                    {},
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -432,9 +438,11 @@ export default {
                     }
                 }
 
-                self.$router.navigateWithPageData(
+                self.$router.navigateWithSaving(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    self.pageName,
+                    self.$route,
+                    {},
+                    {},
                     { partsOrQuestions }
                 );
             } else {
@@ -469,7 +477,7 @@ export default {
                 } else {
                     self.$router.navigateWithSaving(
                         self.navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                        self.pageName
+                        self.$route
                     );
                 }
             }
@@ -477,7 +485,7 @@ export default {
         // Can't use `this` because navigateForward is also called from quote
         async navigateBack(vm) {
             const self = vm ?? this;
-            const currentPage = self.pageName;
+            const currentPage = self.$route.query.fmgPage;
             const pageDataCapabilityQuestions = self.$store.getters.pageData(
                 fmgPageValues.CAPABILITY_QUESTIONS
             );
@@ -531,7 +539,7 @@ export default {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
 
-            self.$router.navigateWithoutSaving(backNavigationScenario, self.pageName);
+            self.$router.navigateWithoutSaving(backNavigationScenario, self.$route);
         },
     },
 };
diff --git a/src/router/a-rewrite/constants/auto-route-table.js b/src/router/a-rewrite/constants/auto-route-table.js
deleted file mode 100644
index 0bf3503b9..000000000
--- a/src/router/a-rewrite/constants/auto-route-table.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { routeData } from "./routes";
-
-export const autoRouteTable = [
-    routeData.QUOTE,
-    routeData.CAPABILITY_QUESTIONS,
-    routeData.MOLDING_QUESTIONS,
-    routeData.VEHICLE_PARTS,
-    routeData.PART_QUESTIONS,
-    routeData.VIN_LOOKUP,
-    routeData.ESTIMATE,
-    routeData.VEHICLE_DAMAGE,
-    routeData.VEHICLE,
-];
diff --git a/src/router/a-rewrite/constants/navigation-scenarios.js b/src/router/a-rewrite/constants/navigation-scenarios.js
deleted file mode 100644
index a6e117948..000000000
--- a/src/router/a-rewrite/constants/navigation-scenarios.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * We want to name these to describe the scenario rather than what page(s) they're used on.
- *
- * Naming convention: [PAST_TENSE_VERB]_[DESCRIPTOR_OF_STATE]
- * ex: Rather than "HAS_PART_QUESTIONS", we might name the
- *     scenario "CLICKED_FORWARD_WITH_PART_QUESTIONS"
- */
-
-const navigationScenarios = {
-    // General
-    CLICKED_BACK: "CLICKED_BACK",
-    CLICKED_FORWARD: "CLICKED_FORWARD",
-    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
-    CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
-
-    // TODO: use virtual page?
-    // Vin selection
-    CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
-    CLICKED_BACK_WITH_SKIP_VIN: "CLICKED_BACK_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
-    CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
-    CLICKED_FORWARD_WITH_SKIP_VIN: "CLICKED_FORWARD_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES: "CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES",
-    SELECTED_VIN_WITH_MISMATCHED_GLASS: "SELECTED_VIN_WITH_MISMATCHED_GLASS",
-    SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
-    SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
-    SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
-    SELECTED_NO_VIN: "SELECTED_NO_VIN",
-    CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
-    CLICKED_VIN_RETRY: "CLICKED_VIN_RETRY",
-
-    // Part selection
-    CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
-    CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_FORWARD_WITH_MOLDING_QUESTIONS: "CLICKED_FORWARD_WITH_MOLDING_QUESTIONS",
-    CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS: "CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS: "CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
-    CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
-    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
-
-    // Insurance-Company
-    CLICKED_PAY_ON_MY_OWN: "CLICKED_PAY_ON_MY_OWN",
-
-    // Schedule
-    CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
-
-    // Payment
-    CLICKED_INSURANCE: "CLICKED_INSURANCE",
-    CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
-    CLICKED_PAY_LATER: "CLICKED_PAY_LATER",
-    PIA_ERROR: "PIA_ERROR",
-    PIA_CC_ERROR: "PIA_CC_ERROR",
-    PIA_APPLE_ERROR: "PIA_APPLE_ERROR",
-    PIA_AFTERPAY_ERROR: "PIA_AFTERPAY_ERROR",
-    PIA_SUCCESS: "PIA_SUCCESS",
-
-    // Return User
-    CLICKED_RESTART: "CLICKED_RESTART",
-};
-
-export { navigationScenarios };
diff --git a/src/router/a-rewrite/constants/route-prefix.js b/src/router/a-rewrite/constants/route-prefix.js
deleted file mode 100644
index 7e5c6f1b9..000000000
--- a/src/router/a-rewrite/constants/route-prefix.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const ROUTE_PREFIX_TRIMMED = "fmg";
-
-export const ROUTE_PREFIX_FULL = `/${ROUTE_PREFIX_TRIMMED}/`;
diff --git a/src/router/a-rewrite/constants/routes.js b/src/router/a-rewrite/constants/routes.js
deleted file mode 100644
index d03954867..000000000
--- a/src/router/a-rewrite/constants/routes.js
+++ /dev/null
@@ -1,123 +0,0 @@
-export const routeData = {
-    VEHICLE: {
-        name: "vehicle",
-        path: "/vehicle",
-    },
-    VEHICLE_DAMAGE: {
-        name: "vehicle-damage",
-        path: "/vehicle-damage",
-    },
-    ESTIMATE: {
-        name: "estimate",
-        path: "/estimate",
-    },
-    ADDRESS_LOOKUP: {
-        name: "address-lookup",
-        path: "/address-lookup",
-    },
-    VIN_LOOKUP: {
-        name: "vin-lookup",
-        path: "/vin-lookup",
-    },
-    LICENSE_PLATE_LOOKUP: {
-        name: "license-plate-lookup",
-        path: "/license-plate-lookup",
-    },
-    SERVICE_ZIP: {
-        name: "service-zip",
-        path: "/service-zip",
-    },
-    ADDRESS_VEHICLES: {
-        name: "address-vehicles",
-        path: "/address-vehicles",
-    },
-    VEHICLE_PARTS: {
-        name: "vehicle-parts",
-        path: "/vehicle-parts",
-    },
-    PART_QUESTIONS: {
-        name: "part-questions",
-        path: "/part-questions",
-    },
-    MOLDING_QUESTIONS: {
-        name: "molding-questions",
-        path: "/molding-questions",
-    },
-    CAPABILITY_QUESTIONS: {
-        name: "capability-questions",
-        path: "/capability-questions",
-    },
-    QUOTE: {
-        name: "quote",
-        path: "/quote",
-    },
-    INSURANCE_COMPANY: {
-        name: "insurance-company",
-        path: "/insurance-company",
-    },
-    SERVICE_LOCATION: {
-        name: "service-location",
-        path: "/service-location",
-    },
-    HERITAGE: {
-        name: "heritage",
-        path: "/virtual/heritage",
-        virtual: true,
-    },
-    SCHEDULE: {
-        name: "schedule",
-        path: "/schedule",
-    },
-    CUSTOMER_DETAILS: {
-        name: "customer-details",
-        path: "/customer-details",
-    },
-    PAYMENT_METHOD: {
-        name: "payment-method",
-        path: "/payment-method",
-    },
-    PAYMENT: {
-        name: "payment",
-        path: "/payment",
-    },
-    PAYMENT_PIA_RETURN: {
-        name: "payment-pia-return",
-        path: "/payment-pia-return",
-    },
-    CONFIRMATION: {
-        name: "confirmation",
-        path: "/confirmation",
-    },
-    RETURN_USER: {
-        name: "return-user",
-        path: "/return-user",
-    },
-    LOAD_SESSION: {
-        name: "load-session",
-        path: "/virtual/load-session",
-        virtual: true,
-    },
-    LANDING: {
-        name: "landing",
-        path: "/",
-        virtual: true,
-    },
-    AUTO_ROUTE: {
-        name: "auto-route",
-        path: "/virtual/auto-route",
-        virtual: true,
-    },
-    // TODO: RENAME FROM BAILOUT
-    ERROR: {
-        name: "error",
-        path: "/virtual/error",
-        virtual: true,
-    },
-    RESTART: {
-        name: "restart",
-        path: "/virtual/restart",
-        virtual: true,
-    },
-};
-
-export const FUNNEL_START_PAGE = routeData.VEHICLE;
diff --git a/src/router/a-rewrite/constants/routing-table.js b/src/router/a-rewrite/constants/routing-table.js
deleted file mode 100644
index 10ee7ae90..000000000
--- a/src/router/a-rewrite/constants/routing-table.js
+++ /dev/null
@@ -1,596 +0,0 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
-import store from "@/store";
-import { paymentMethods } from "../../../constants/payment-method-constants";
-
-// Get as function to live-evaluate filters
-const routingTable = function () {
-    return [
-        {
-            pageName: routeData.VEHICLE.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.VEHICLE_DAMAGE.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.VEHICLE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-            ],
-        },
-        {
-            pageName: routeData.VIN_LOOKUP.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                    params: {
-                        displayVehicleChangeAlert: true,
-                    },
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.LICENSE_PLATE_LOOKUP.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                    params: {
-                        displayVehicleChangeAlert: true,
-                    },
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.ADDRESS_LOOKUP.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                    destinationPageData: routeData.ADDRESS_VEHICLES,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                    params: {
-                        displayVehicleChangeAlert: true,
-                    },
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.ADDRESS_VEHICLES.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                    params: {
-                        displayVehicleChangeAlert: true,
-                    },
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.ESTIMATE.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
-                    destinationPageData: routeData.LICENSE_PLATE_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
-                    destinationPageData: routeData.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_NO_VIN,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-            ],
-        },
-        {
-            pageName: routeData.SERVICE_ZIP.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    destinationPageData: routeData.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.PART_QUESTIONS.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.VEHICLE_PARTS.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.MOLDING_QUESTIONS.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.CAPABILITY_QUESTIONS.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.QUOTE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.QUOTE.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationPageData: routeData.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationPageData: routeData.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationPageData: routeData.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationPageData: routeData.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationPageData: routeData.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
-                    destinationPageData: routeData.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    destinationPageData: routeData.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            pageName: routeData.INSURANCE_COMPANY.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_ON_MY_OWN,
-                    destinationPageData: routeData.QUOTE,
-                    params: {
-                        offer: "cash",
-                    },
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.INSURANCE_DETAILS,
-                },
-            ],
-        },
-        {
-            pageName: routeData.SERVICE_LOCATION.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.SCHEDULE,
-                },
-            ],
-        },
-        {
-            pageName: routeData.SCHEDULE.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
-                    destinationPageData: routeData.SERVICE_LOCATION,
-                },
-            ],
-        },
-        {
-            pageName: routeData.CUSTOMER_DETAILS.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.SCHEDULE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationPageData: routeData.PAYMENT_METHOD,
-                },
-            ],
-        },
-        {
-            pageName: routeData.PAYMENT_METHOD.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.CONFIRMATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationPageData: routeData.PAYMENT,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_INSURANCE,
-                    destinationPageData: routeData.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            pageName: routeData.PAYMENT.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationPageData: routeData.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.CONFIRMATION,
-                },
-                {
-                    scenario: navigationScenarios.PIA_ERROR,
-                    destinationPageData: routeData.PAYMENT_METHOD,
-                    params: {
-                        piaError: "true",
-                    },
-                },
-            ],
-        },
-        {
-            pageName: routeData.PAYMENT_PIA_RETURN.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.PIA_ERROR,
-                    destinationPageData: routeData.PAYMENT_METHOD,
-                    params: {
-                        piaError: "true",
-                    },
-                },
-                {
-                    scenario: navigationScenarios.PIA_CC_ERROR,
-                    destinationPageData: routeData.PAYMENT,
-                    params: {
-                        piaErrorType: paymentMethods.CREDIT_CARD,
-                    },
-                },
-                {
-                    scenario: navigationScenarios.PIA_APPLE_ERROR,
-                    destinationPageData: routeData.PAYMENT,
-                    params: {
-                        piaErrorType: paymentMethods.APPLE_PAY,
-                    },
-                },
-                {
-                    scenario: navigationScenarios.PIA_AFTERPAY_ERROR,
-                    destinationPageData: routeData.PAYMENT,
-                    params: {
-                        piaErrorType: paymentMethods.AFTERPAY,
-                    },
-                },
-                {
-                    scenario: navigationScenarios.PIA_SUCCESS,
-                    destinationPageData: routeData.CONFIRMATION,
-                },
-            ],
-        },
-        {
-            pageName: routeData.CONFIRMATION.name,
-        },
-        {
-            pageName: routeData.RETURN_USER.name,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationPageData: routeData.LOAD_SESSION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_RESTART,
-                    destinationPageData: routeData.RESTART,
-                },
-            ],
-        },
-    ];
-};
-
-export { routingTable };
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
deleted file mode 100644
index 3a84a1730..000000000
--- a/src/router/a-rewrite/index.js
+++ /dev/null
@@ -1,421 +0,0 @@
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { createRoute, createVirtualRoute } from "@/router/a-rewrite/logic/create-route";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { createWebHistory, createRouter } from "vue-router";
-import { getDestination } from "@/router/a-rewrite/logic/get-destination";
-import analyticsMixin from "@/mixins/analytics-mixin";
-import {
-    getFunnelCookie,
-    deleteFunnelCookie,
-    updateOrCreateFunnelCookie,
-} from "@/helpers/heritage-integration/cookie-helper";
-import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
-import store from "@/store";
-import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
-import { sessionStorageKeyConstants } from "@/constants/session-storage";
-import { savePageData } from "@/router/a-rewrite/logic/save-page-data";
-import eventBus from "@/helpers/event-bus/event-bus";
-import { globalEvents, globalEventTypes } from "@/constants/events";
-import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
-import { queryStrings } from "@/constants/query-strings";
-import { consumeReferralQuerystrings } from "@/router/a-rewrite/logic/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/a-rewrite/logic/initialize-from-querystrings";
-import { getBoolFromString } from "@/helpers/boolean-helper";
-import { isVerifiedInsurance } from "@/router/a-rewrite/logic/requires-verified-redirect";
-import baseMixin from "@/mixins/base-mixin";
-import { runExperiments } from "@/router/a-rewrite/logic/run-experiments";
-import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
-import { buildManualUrl } from "@/router/a-rewrite/logic/build-manual-url";
-import { consumeQueryFromStash, stashAllQueries } from "@/router/a-rewrite/logic/querystring-stash";
-
-const routes = [
-    // Non-virtual pages.
-    createRoute(routeData.VEHICLE, async (to, from) => {
-        // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
-        const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
-        if (hasVehicleChanged) {
-            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
-        }
-
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.VEHICLE_DAMAGE.name,
-                replace: true,
-            };
-        }
-    }),
-    createRoute(routeData.VEHICLE_DAMAGE),
-    createRoute(routeData.ESTIMATE),
-    createRoute(routeData.ADDRESS_LOOKUP),
-    createRoute(routeData.VIN_LOOKUP),
-    createRoute(routeData.LICENSE_PLATE_LOOKUP),
-    createRoute(routeData.SERVICE_ZIP),
-    createRoute(routeData.ADDRESS_VEHICLES),
-    createRoute(routeData.VEHICLE_PARTS),
-    createRoute(routeData.PART_QUESTIONS),
-    createRoute(routeData.MOLDING_QUESTIONS),
-    createRoute(routeData.CAPABILITY_QUESTIONS),
-    createRoute(routeData.QUOTE, async (to, from) => {
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.HERITAGE.name,
-                replace: true,
-            };
-        }
-
-        const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
-
-        if (offerQuote === "true") {
-            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
-        }
-    }),
-    createRoute(routeData.INSURANCE_COMPANY, async (to, from) => {
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.HERITAGE.name,
-                replace: true,
-            };
-        }
-    }),
-    createRoute(routeData.SERVICE_LOCATION),
-    createRoute(routeData.SCHEDULE),
-    createRoute(routeData.CUSTOMER_DETAILS),
-    createRoute(routeData.PAYMENT_METHOD),
-    createRoute(routeData.PAYMENT),
-    createRoute(routeData.PAYMENT_PIA_RETURN),
-    createRoute(routeData.CONFIRMATION),
-    createRoute(routeData.RETURN_USER),
-
-    // Virtual pages (resolve to a non-virtual page.)
-    createVirtualRoute(routeData.LANDING, async (to, from) => {
-        await initializeFromQueryStrings();
-        // Save querystrings to temporary stash so they can be referred to later.
-        stashAllQueries(to);
-        // Change referral info. For use in local testing for insurance crossover.
-        await consumeReferralQuerystrings();
-
-        // Check for fmgpage parameter
-        const fmgPage = to?.query?.fmgPage;
-        if (fmgPage && router.hasRoute(fmgPage)) {
-            return {
-                name: fmgPage,
-                replace: true,
-            };
-        }
-
-        // If a session is still in memory, go to return-user.
-        if (store.getters.vehicle?.year > 0) {
-            console.log(`trying to redirect!`);
-            return {
-                name: routeData.RETURN_USER.name,
-                replace: true,
-            };
-        }
-
-        // Otherwise, load session and auto-route
-        return {
-            name: routeData.LOAD_SESSION.name,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.HERITAGE, async (to, from) => {
-        await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
-    }),
-    createVirtualRoute(routeData.LOAD_SESSION, async (to, from) => {
-        const loadSessionResponse = await loadSessionIfPresent(false, to.name);
-
-        return {
-            name: routeData.AUTO_ROUTE.name,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.AUTO_ROUTE, async (to, from) => {
-        for (let i = 0; i < autoRouteTable.length; i++) {
-            const testRouteData = autoRouteTable[i];
-
-            const isReady = await router.checkPagePrerequisites(testRouteData.name);
-
-            if (isReady) {
-                return {
-                    name: testRouteData.name,
-                    replace: true,
-                };
-            }
-        }
-
-        return {
-            name: FUNNEL_START_PAGE,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.ERROR, async (to, from) => {
-        // If we've already encountered one error, clear session to avoid more.
-        // Otherwise mark that we encoutnered an error here.
-        if (store.getters.applicationUser.hasAlreadyTriggeredError) {
-            return {
-                name: routeData.RESTART.name,
-                replace: true,
-            };
-        } else {
-            await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
-        }
-
-        // Add error event to bus
-        eventBus.addEventToBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.UNKNOWN_ERROR,
-            {
-                isDismissable: true,
-                messageCopy: "",
-                messageHeadline: "We're sorry, something went wrong.",
-                type: globalEventTypes.Danger,
-            }
-        );
-
-        let nextPage = FUNNEL_START_PAGE.name;
-
-        baseMixin.methods?.ResetExternalParamsAndHideModal();
-
-        if (store.getters.payment?.insuranceCoverage?.isVerified) {
-            nextPage = routeData.VEHICLE_DAMAGE.name;
-        }
-
-        if (from.name === nextPage) {
-            // Router won't load the page if we redirect to the already existing page
-            // Force refresh in this scenario.
-            router.go(0);
-            return false;
-        }
-
-        return {
-            name: nextPage,
-            replace: false,
-        };
-    }),
-    createVirtualRoute(routeData.RESTART, async (to, from) => {
-        await store.dispatch(storeActions.RESET_STATE);
-        deleteFunnelCookie();
-
-        if (from.name === FUNNEL_START_PAGE.name) {
-            // Router won't load the page if we redirect to the already existing page
-            // Force refresh in this scenario.
-            router.go(0);
-            return false;
-        }
-
-        return {
-            name: FUNNEL_START_PAGE.name,
-            replace: true,
-        };
-    }),
-];
-
-const router = createRouter({
-    history: createWebHistory(ROUTE_PREFIX_FULL),
-    routes,
-    // Scroll to top on navigation.
-    scrollBehavior(to, from, savedPosition) {
-        return { top: 0 };
-    },
-});
-
-////-- Global Guards
-
-router.beforeEach(async (to, from) => {
-    console.log(to);
-    try {
-        await analyticsMixin.methods.validateSession();
-
-        if (getFunnelCookie()?.SuppressConceptFunnel) {
-            // Redirect to heritage.
-            return {
-                name: routeData.HERITAGE.name,
-            };
-        }
-
-        // Ensure session has not expired
-        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
-            const errorPayload = {
-                cause: "expired session",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            router.bailout(errorPayload, true);
-            return false;
-        }
-
-        // Block navigation if an order has been submitted.
-        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
-            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
-                return false;
-            }
-        }
-
-        // Process funnel cookie.
-        updateOrCreateFunnelCookie();
-
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
-        // Ensure page-prerequisites are fulfilled
-        const arePagePrerequisitesValid = await router.checkPagePrerequisites(to.name);
-
-        if (!arePagePrerequisitesValid) {
-            const errorPayload = {
-                cause: "invalid page prerequisites for page",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            router.bailout(errorPayload);
-            return;
-        }
-
-        await runExperiments(to.name);
-    } catch (error) {
-        const errorPayload = {
-            cause: "Uncaught exception in `beforeEach`.",
-            currentPage: from?.name,
-            nextPage: to?.name,
-        };
-
-        console.log(error);
-
-        router.bailout(errorPayload);
-        return;
-    }
-});
-
-router.afterEach(async (to, from) => {
-    // Push page view to GA
-    analyticsMixin.methods.pushPageViewToGA();
-
-    // Push experiments to Data Layer
-    analyticsMixin.methods.pushExperimentsToDataLayer();
-
-    // Push current order status to Data Layer
-    analyticsMixin.methods.pushOrderToDataLayer();
-});
-
-////-- End Global Guards
-
-////-- Bound Functions
-
-router.getRoute = (pageName) => {
-    return router.getRoutes().find((r) => r.name === pageName);
-};
-
-router.checkPagePrerequisites = async (pageName) => {
-    const route = router.getRoute(pageName);
-
-    if (!route) {
-        return false;
-    }
-
-    let component = route.components;
-
-    // Virtual routes have no component, so skip check.
-    if (!component) {
-        return true;
-    }
-
-    if (component?.default?.methods === undefined) {
-        component = await component?.default();
-    }
-
-    return component?.default?.methods?.arePagePrerequisitesValid();
-};
-
-router.navigateWithoutSaving = async (scenario, currentPageName) => {
-    return await router.navigate(currentPageName, scenario, false);
-};
-
-router.navigateWithSaving = async (scenario, currentPageName) => {
-    return await router.navigate(currentPageName, scenario, true);
-};
-
-router.navigateWithPageData = async (scenario, currentPageName, pageData = {}) => {
-    const nextPage = getDestination(currentPageName, scenario);
-    await savePageData(nextPage.name, pageData);
-
-    return await router.navigate(currentPageName, scenario, true);
-};
-
-router.navigateAndForceTopLevelNavigation = async (scenario, currentPageName, saving = false) => {
-    return await router.navigate(currentPageName, scenario, saving, true);
-};
-
-router.bailout = (errorPayload, forceRestart = false) => {
-    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-
-    if (forceRestart) {
-        router.push({
-            name: routeData.RESTART.name,
-        });
-    } else {
-        router.push({
-            name: routeData.ERROR.name,
-        });
-    }
-};
-
-router.navigate = async (
-    currentPageName,
-    scenario,
-    withSaving = false,
-    forceTopLevelNav = false
-) => {
-    // Check to see if calling page is same as current page.
-    // If not, cancel navigation before it begins.
-    const callingRoute = currentPageName;
-    const actualRoute = router.currentRoute.value.name;
-
-    if (callingRoute !== actualRoute) {
-        return false;
-    }
-
-    const nextPage = getDestination(currentPageName, scenario);
-
-    if (!nextPage) {
-        console.error(
-            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
-        );
-
-        const errorPayload = {
-            cause: "invalid page name",
-            currentPage: currentPageName,
-            nextPage: nextPage?.name,
-        };
-
-        router.bailout(errorPayload);
-        return;
-    }
-
-    if (withSaving) {
-        await saveSession({ pageNameToLog: nextPage.name });
-    }
-
-    // Some pages require manually setting the next url
-    // to work with iframes.
-    if (forceTopLevelNav) {
-        const newUrl = buildManualUrl(nextPage);
-        window.top.location.href = newUrl;
-        return;
-    }
-
-    // All other pages use router.push
-    router.push({
-        name: nextPage.name,
-        query: nextPage.params ?? {},
-    });
-};
-
-////-- End Router Functions
-
-export default router;
diff --git a/src/router/a-rewrite/logic/build-manual-url.js b/src/router/a-rewrite/logic/build-manual-url.js
deleted file mode 100644
index 017816d6b..000000000
--- a/src/router/a-rewrite/logic/build-manual-url.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { ROUTE_PREFIX_TRIMMED } from "@/router/a-rewrite/constants/route-prefix";
-
-export function buildManualUrl(nextPage) {
-    const queries = nextPage.params;
-    const querystring = buildSearchParams(queries);
-
-    const url = `${window.top.location.origin}/${ROUTE_PREFIX_TRIMMED}${nextPage.path}${querystring}`;
-
-    return url;
-}
-
-function buildSearchParams(paramList) {
-    if (!paramList) {
-        return "";
-    }
-
-    const keys = Object.keys(paramList);
-    if (keys?.length > 0) {
-        const queryFormattedParams = keys.map((k) => `${k}=${paramList[k]}`);
-
-        const querystring = queryFormattedParams.reduce((a, b) => `${a}&${b}`);
-
-        return `?${querystring}`;
-    }
-
-    return "";
-}
diff --git a/src/router/a-rewrite/logic/consume-referral-info.js b/src/router/a-rewrite/logic/consume-referral-info.js
deleted file mode 100644
index 5c1dceafc..000000000
--- a/src/router/a-rewrite/logic/consume-referral-info.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import { queryStrings } from "@/constants/query-strings";
-import store from "@/store";
-import { storeMutations } from "@/constants/store-mutations";
-import { updateOrCreateFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-
-export async function consumeReferralQuerystrings() {
-    const referralNumber = getQuerystringParameter(queryStrings.REFERRAL_NUMBER);
-    const parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
-    const correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
-    if (referralNumber) {
-        store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
-        store.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccount);
-        store.commit(storeMutations.UPDATE_REFERRAL_CORRELATION_ID, correlationId);
-        // log(" --update cookie");
-        updateOrCreateFunnelCookie();
-    }
-}
diff --git a/src/router/a-rewrite/logic/create-route.js b/src/router/a-rewrite/logic/create-route.js
deleted file mode 100644
index 44e27b568..000000000
--- a/src/router/a-rewrite/logic/create-route.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { lazyLoadComponent } from "@/router/a-rewrite/logic/lazy-load-component";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-
-export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
-    return {
-        name: routeDatum.name,
-        path: routeDatum.path,
-        component: lazyLoadComponent(routeDatum.name),
-        beforeEnter: async (to, from) => {
-            try {
-                return await beforeEnter(to, from);
-            } catch {
-                return {
-                    name: routeData.BAILOUT.name,
-                    replace: true,
-                };
-            }
-        },
-    };
-}
-
-export function createVirtualRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
-    return {
-        name: routeDatum.name,
-        path: routeDatum.path,
-        beforeEnter: async (to, from) => {
-            try {
-                return await beforeEnter(to, from);
-            } catch (error) {
-                console.log(error);
-                return {
-                    name: routeData.BAILOUT.name,
-                    replace: true,
-                };
-            }
-        },
-        virtual: true,
-    };
-}
diff --git a/src/router/a-rewrite/logic/get-destination.js b/src/router/a-rewrite/logic/get-destination.js
deleted file mode 100644
index cd04ddaad..000000000
--- a/src/router/a-rewrite/logic/get-destination.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { routingTable } from "@/router/a-rewrite/constants/routing-table";
-
-export function getDestination(sourcePageName, navigationScenario) {
-    const table = routingTable();
-
-    const pageEntry = table.find((entry) => entry.pageName === sourcePageName);
-
-    const map = pageEntry?.maps?.find((map) => map.scenario === navigationScenario);
-
-    if (!map || map?.filter === false) {
-        return null;
-    }
-
-    return {
-        ...map.destinationPageData,
-        params: map.params,
-    };
-}
diff --git a/src/router/a-rewrite/logic/initialize-from-querystrings.js b/src/router/a-rewrite/logic/initialize-from-querystrings.js
deleted file mode 100644
index 2e12f88eb..000000000
--- a/src/router/a-rewrite/logic/initialize-from-querystrings.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import {
-    setupAdvertiserTracking,
-    getAffiliateCookies,
-} from "@/helpers/heritage-integration/cookie-helper";
-import store from "@/store";
-import { storeMutations } from "@/constants/store-mutations";
-import { storeActions } from "@/constants/store-actions";
-import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import { queryStrings } from "@/constants/query-strings";
-import { externalParameterStatus } from "@/constants/external-parameters";
-
-export async function initializeFromQueryStrings() {
-    // Get advertiser info
-    setupAdvertisersAndAffiliates();
-
-    // Read all external paramter queries and write to store.
-    updateExternalParameterState();
-}
-
-function setupAdvertisersAndAffiliates() {
-    const affiliateCookies = getAffiliateCookies();
-    if (affiliateCookies != null && affiliateCookies.length > 0) {
-        store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
-    }
-    setupAdvertiserTracking();
-}
-
-function updateExternalParameterState() {
-    const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
-    const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
-    const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
-    const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
-    const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
-    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
-    const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
-    const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
-    const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
-    const externalParameterServicePackage = getQuerystringParameter(queryStrings.SERVICE_PACKAGE);
-    const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
-    const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
-    const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
-    if (
-        externalParameterYear &&
-        externalParameterMake &&
-        externalParameterModel &&
-        externalParameterStyle
-    ) {
-        resetStoreForExternalParameter();
-        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
-    }
-    if (
-        externalParameterDamage &&
-        (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR" ||
-            externalParameterNumberOfChips?.length > 0)
-    ) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_DAMAGE_TYPE, externalParameterDamage);
-        if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPLACE") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS, null);
-        } else if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPAIR") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, true);
-            store.commit(
-                storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS,
-                externalParameterNumberOfChips
-            );
-        }
-    }
-    if (externalParameterZipCode) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
-    }
-    if (externalParameterEmail) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
-            externalParameterEmail
-        );
-    }
-    if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE,
-            externalParameterServicePackage?.toLowerCase()
-        );
-    }
-    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
-            externalParameterVinSelection
-        );
-    }
-    if (externalParameterSource) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_SOURCE, externalParameterSource);
-    }
-    if (externalParameterPhoneNumber) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
-            externalParameterPhoneNumber
-        );
-    }
-}
-
-// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
-// are returning.  clear out prior related things that need to be selected again like parts and damage type.
-function resetStoreForExternalParameter() {
-    if (
-        store.getters.externalParameterState?.isExternalParameter ==
-        externalParameterStatus.INACTIVE
-    ) {
-        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
-        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
-            state: null,
-            zipCode: null,
-            zipCodeCtu: null,
-        });
-        store.dispatch(storeActions.SAVE_EMAIL, null);
-        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
-    }
-}
diff --git a/src/router/a-rewrite/logic/lazy-load-component.js b/src/router/a-rewrite/logic/lazy-load-component.js
deleted file mode 100644
index cb91c06c0..000000000
--- a/src/router/a-rewrite/logic/lazy-load-component.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function lazyLoadComponent(componentName) {
-    return () => import(`@/layouts/${componentName}/${componentName}.vue`);
-}
diff --git a/src/router/a-rewrite/logic/querystring-stash.js b/src/router/a-rewrite/logic/querystring-stash.js
deleted file mode 100644
index 96b206572..000000000
--- a/src/router/a-rewrite/logic/querystring-stash.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import { reactive } from "vue";
-
-const queryStash = reactive({
-    queries: [],
-});
-
-function stash(key, value) {
-    const existingValue = getStashedQuery(key);
-
-    if (existingValue) {
-        existingValue.value = value;
-        existingValue.used = false;
-        return;
-    }
-
-    queryStash.queries.push({
-        key: key,
-        value: value,
-        used: false,
-    });
-}
-
-export function stashAllQueries(toRoute) {
-    const keys = Object.keys(toRoute.query);
-
-    keys.forEach((k) => stash(k, toRoute.query[k]));
-}
-
-function getStashedQuery(key) {
-    const match = queryStash.queries.find(
-        (entry) => entry?.key?.toLowerCase() === key?.toLowerCase()
-    );
-
-    return match;
-}
-
-export function peekQueryFromStash(key) {
-    return getStashedQuery(key)?.value;
-}
-
-export function consumeQueryFromStash(key) {
-    const match = getStashedQuery(key);
-
-    if (match) {
-        if (!match.used) {
-            match.used = true;
-            return match.value;
-        }
-
-        return null;
-    }
-
-    return null;
-}
-
-export function clearStash() {
-    queryStash.queries = [];
-}
diff --git a/src/router/a-rewrite/logic/requires-verified-redirect.js b/src/router/a-rewrite/logic/requires-verified-redirect.js
deleted file mode 100644
index 19f088687..000000000
--- a/src/router/a-rewrite/logic/requires-verified-redirect.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import store from "@/store";
-
-export function isVerifiedInsurance() {
-    return (
-        store.getters.payment?.insuranceCoverage?.isVerified ||
-        store.getters.order?.referralNumber?.length === 6
-    );
-}
diff --git a/src/router/a-rewrite/logic/run-experiments.js b/src/router/a-rewrite/logic/run-experiments.js
deleted file mode 100644
index 97472ad0c..000000000
--- a/src/router/a-rewrite/logic/run-experiments.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import store from "@/store";
-import baseMixin from "@/mixins/base-mixin";
-import { storeActions } from "@/constants/store-actions";
-import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
-import { experimentTriggers } from "@/constants/experiments";
-import { applicationConfig } from "@/constants/application-config";
-
-export async function runExperiments(nextPageName) {
-    if (!store.getters.applicationUser.triggeredSiteEntry) {
-        await baseMixin.methods.dispatchStoreActionWithLogging(
-            storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-            {
-                deviceId: getDeviceIdValue(),
-                triggerEvent: experimentTriggers.SITE_ENTRY,
-                triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
-            },
-            nextPageName
-        );
-    }
-
-    await baseMixin.methods.dispatchStoreActionWithLogging(
-        storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-        {
-            deviceId: getDeviceIdValue(),
-            triggerEvent: experimentTriggers.PAGE_ENTRY,
-            triggerValue: nextPageName,
-        },
-        nextPageName
-    );
-}
diff --git a/src/router/a-rewrite/logic/save-page-data.js b/src/router/a-rewrite/logic/save-page-data.js
deleted file mode 100644
index 1299f8900..000000000
--- a/src/router/a-rewrite/logic/save-page-data.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import store from "@/store";
-import { storeMutations } from "@/constants/store-mutations";
-
-export async function savePageData(page, data) {
-    const existingPageData = store.getters.pageData(page);
-
-    const dataToSave = Object.keys(data).length > 0 ? data : (existingPageData ?? {});
-
-    // Save data if non-null
-    store.commit(storeMutations.UPDATE_PAGE_DATA, { page: page, data: dataToSave });
-}
diff --git a/src/store/index.js b/src/store/index.js
index 468a9e9eb..753d8509b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -199,7 +199,6 @@ const getDefaultState = () => {
             triggeredSiteEntry: false,
             affiliateCookies: [],
             loggingOption: false,
-            hasAlreadyTriggeredError: false,
         },
     };
 };
@@ -825,9 +824,6 @@ export const mutations = {
     updateAffiliateCookies(state, affiliateCookies) {
         state.applicationUser.affiliateCookies = affiliateCookies;
     },
-    updateHasTriggeredError(state, hasTriggeredError) {
-        state.applicationUser.hasAlreadyTriggeredError = hasTriggeredError;
-    },
 };
 
 // Export Getters
@@ -3432,10 +3428,6 @@ export const actions = {
             }
         }
     },
-
-    updateHasTriggeredError(context, hasAlreadyTriggeredError) {
-        context.commit(storeMutations.UPDATE_HAS_TRIGGERED_ERROR, hasAlreadyTriggeredError);
-    },
 };
 
 export default createStore({

From 72952209ee8b5a2c3fff8f6a0ebe90b393e2626c Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 13 May 2025 16:11:49 -0400
Subject: [PATCH 50/64] CASH-690: fix view more dates error

---
 .../date-picker/date-picker.vue                   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 1a7df91e0..ecb83fc36 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -688,17 +688,18 @@ export default {
             if (!this.months) return;
             this.isLoading = true;
             let monthToShow;
-            let monthStartDateNum = 0;
+            let monthStartDate;
 
             if (this.hideSomeDaysForInitialView) {
                 monthToShow = this.months.find(
                     ({ isMonthThatHidesSomeDaysForInitialView }) =>
                         isMonthThatHidesSomeDaysForInitialView
                 );
+
                 // find the first day-hidden to become the next api call start date
-                monthStartDateNum =
-                    monthToShow.dates.find(({ dayClasses }) => dayClasses.includes("day-hidden"))
-                        .dateNum - 1;
+                monthStartDate = monthToShow.dates.find(({ dayClasses }) =>
+                    dayClasses.includes("day-hidden")
+                );
             } else {
                 if (this.calendarViewDirection === "future") {
                     monthToShow = this.months.find((month) =>
@@ -713,9 +714,13 @@ export default {
                 }
             }
             if (monthToShow) {
+                const monthStartDateString = monthStartDate
+                    ? monthStartDate.inputValue
+                    : monthToShow.dates[0].inputValue;
+
                 // make new API call with this month's start and end dates
                 const moreSelectableDatesData = await this.updateSelectableDates(
-                    monthToShow.dates[monthStartDateNum].inputValue,
+                    monthStartDateString,
                     monthToShow.dates[monthToShow.dates.length - 1].inputValue
                 );
                 this.isLoading = false;

From 541536b3afcd706cc9265229fdea40c06e3f8120 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:36:01 -0400
Subject: [PATCH 51/64] Reapply "Omnibus"

This reverts commit ac3df43577426804f64ed0ea7d1cdd43d7be1041.
---
 src/App.vue                                   |   3 +
 src/constants/application-config.js           |  19 +-
 src/constants/store-actions.js                |   1 +
 src/constants/store-mutations.js              |   1 +
 .../text-block/text-block.vue                 |   2 +-
 .../progress-bar/progress-bar.vue             |   2 +-
 src/global-methods.js                         |   4 +-
 .../heritage-integration/order-helper.js      |  26 +-
 src/layouts/address-lookup/address-lookup.vue |  17 +-
 .../address-vehicles/address-vehicles.vue     |  11 +-
 src/layouts/bailout/bailout.vue               |   2 +-
 .../capability-questions.vue                  |   2 +-
 src/layouts/confirmation/confirmation.vue     |  15 +-
 .../customer-details/customer-details.vue     |  15 +-
 src/layouts/estimate/estimate.vue             |  22 +-
 .../insurance-company/insurance-company.vue   |  15 +-
 .../license-plate-lookup.vue                  |  16 +-
 .../molding-questions/molding-questions.vue   |   2 +-
 src/layouts/part-questions/part-questions.vue |   2 +-
 src/layouts/payment-method/payment-method.vue |  29 +-
 .../payment-pia-return/payment-pia-return.vue |  47 +-
 src/layouts/payment/payment.vue               |  32 +-
 src/layouts/quote/quote.vue                   |  27 +-
 src/layouts/return-user/return-user.vue       |  10 +-
 src/layouts/schedule/schedule.vue             |  12 +-
 .../service-location/service-location.vue     |   9 +-
 src/layouts/service-zip/service-zip.vue       |  11 +-
 src/layouts/vehicle-damage/vehicle-damage.vue |  37 +-
 .../glass-part-question.vue                   |   2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue   |   2 +-
 src/layouts/vehicle/vehicle.vue               |  15 +-
 src/layouts/vin-lookup/vin-lookup.vue         |  14 +-
 src/main.js                                   |   2 +-
 src/mixins/base-mixin.js                      |   9 +-
 src/mixins/vehicle-questions-mixin.js         |  36 +-
 .../a-rewrite/constants/auto-route-table.js   |  13 +
 .../constants/navigation-scenarios.js         |  69 ++
 .../a-rewrite/constants/route-prefix.js       |   3 +
 src/router/a-rewrite/constants/routes.js      | 123 ++++
 .../a-rewrite/constants/routing-table.js      | 596 ++++++++++++++++++
 src/router/a-rewrite/index.js                 | 421 +++++++++++++
 .../a-rewrite/logic/build-manual-url.js       |  27 +
 .../a-rewrite/logic/consume-referral-info.js  |  18 +
 src/router/a-rewrite/logic/create-route.js    |  39 ++
 src/router/a-rewrite/logic/get-destination.js |  18 +
 .../logic/initialize-from-querystrings.js     | 121 ++++
 .../a-rewrite/logic/lazy-load-component.js    |   3 +
 .../a-rewrite/logic/querystring-stash.js      |  58 ++
 .../logic/requires-verified-redirect.js       |   8 +
 src/router/a-rewrite/logic/run-experiments.js |  30 +
 src/router/a-rewrite/logic/save-page-data.js  |  11 +
 src/store/index.js                            |   8 +
 52 files changed, 1816 insertions(+), 221 deletions(-)
 create mode 100644 src/router/a-rewrite/constants/auto-route-table.js
 create mode 100644 src/router/a-rewrite/constants/navigation-scenarios.js
 create mode 100644 src/router/a-rewrite/constants/route-prefix.js
 create mode 100644 src/router/a-rewrite/constants/routes.js
 create mode 100644 src/router/a-rewrite/constants/routing-table.js
 create mode 100644 src/router/a-rewrite/index.js
 create mode 100644 src/router/a-rewrite/logic/build-manual-url.js
 create mode 100644 src/router/a-rewrite/logic/consume-referral-info.js
 create mode 100644 src/router/a-rewrite/logic/create-route.js
 create mode 100644 src/router/a-rewrite/logic/get-destination.js
 create mode 100644 src/router/a-rewrite/logic/initialize-from-querystrings.js
 create mode 100644 src/router/a-rewrite/logic/lazy-load-component.js
 create mode 100644 src/router/a-rewrite/logic/querystring-stash.js
 create mode 100644 src/router/a-rewrite/logic/requires-verified-redirect.js
 create mode 100644 src/router/a-rewrite/logic/run-experiments.js
 create mode 100644 src/router/a-rewrite/logic/save-page-data.js

diff --git a/src/App.vue b/src/App.vue
index 422ae2893..f4c5754aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,6 +36,9 @@ export default {
         loadingModal,
         funnelFooter,
     },
+    mounted() {
+        showFmgLoadingModal(true);
+    },
 };
 
 // Add a global Javascript exception handler for logging exceptions, this handler will log when there is an uncaught exception
diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 14f195cfc..a03e5f010 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -15,21 +15,12 @@ const applicationConfig = {
     CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER: "87291",
     MY_ACCOUNT: process.env.VUE_APP_MY_ACCOUNT,
     PIA_RESPONSE_URL:
-        location.protocol +
-        "//" +
-        location.host +
-        "/fmg/?fmgPage=payment-pia-return&src=concept-funnel",
+        location.protocol + "//" + location.host + "/fmg/payment-pia-return?src=concept-funnel",
     PIA_CANCEL_URL:
-        location.protocol +
-        "//" +
-        location.host +
-        "/fmg/?fmgPage=payment-method&src=concept-funnel",
+        location.protocol + "//" + location.host + "/fmg/payment-method?src=concept-funnel",
     PIA_ERROR_URL:
-        location.protocol +
-        "//" +
-        location.host +
-        "/fmg/?fmgPage=payment-pia-return&src=concept-funnel",
-    CONFIRMATION_URL: location.protocol + "//" + location.host + "/fmg/?fmgPage=confirmation",
+        location.protocol + "//" + location.host + "/fmg/payment-pia-return?src=concept-funnel",
+    CONFIRMATION_URL: location.protocol + "//" + location.host + "/fmg/confirmation",
     GOOGLE_CALENDAR: "https://www.google.com/calendar/render?action=TEMPLATE",
     YAHOO_CALENDAR: "https://calendar.yahoo.com/?v=60",
     OUTLOOK_CALENDAR:
@@ -38,7 +29,7 @@ const applicationConfig = {
     AFFILIATE_COOKIE_CONTAINING_NAME: "_Track",
     COOKIE_NAME_LENGTH_MAX_LIMIT: 44,
     SESSION_TIMEOUT_MINUTES: process.env.VUE_APP_SESSION_TIMEOUT_MINUTES,
-    RETURN_USER_PAGE: "/fmg/?fmgPage=return-user",
+    RETURN_USER_PAGE: "/fmg/return-user",
 };
 
 export { applicationConfig };
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 7b76d4064..9f0965480 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -117,6 +117,7 @@ const storeActions = {
     UPDATE_EXTERNAL_PARAMETER_MMS: "updateExternalParameterMMS",
 
     SAVE_LOGGING_OPTION: "saveLoggingOption",
+    UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 5064864d0..f7e8d9f4b 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -94,6 +94,7 @@ const storeMutations = {
     UPDATE_SAVE_SESSION_PROMISE: "updateSaveSessionPromise",
     UPDATE_LAST_PAGE_VISITED: "updateLastPageVisited",
     UPDATE_LOGGING_OPTION: "updateLoggingOption",
+    UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
 
     // EXPERIMENT MUTATIONS
     UPDATE_EXPERIMENTS: "updateExperiments",
diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index b84f12283..c7bb61215 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -58,7 +58,7 @@ export default {
         getRouterLinkDisplayTextFromCopy,
         getExternalLink,
         navigateWithScenario(scenarioName) {
-            this.$router.navigateWithoutSaving(scenarioName, this.$route);
+            this.$router.navigateWithoutSaving(scenarioName, this.pageName);
         },
     },
     computed: {
diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index ab6a00b3a..da370e415 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -17,7 +17,7 @@ export default {
     },
     methods: {
         getProgress() {
-            var pageName = store.getters.applicationUser.lastPageVisited;
+            var pageName = this.pageName;
             return getProgressBarPercentage(pageName);
         },
     },
diff --git a/src/global-methods.js b/src/global-methods.js
index ba6cec1ec..784ba6782 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import router from "@/router";
+import router from "@/router/a-rewrite";
 import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
@@ -117,7 +117,7 @@ export default {
                             endpoint: endpoint,
                         };
 
-                        router.navigateError(errorPayload);
+                        router.bailout(errorPayload);
 
                         // do not log 404 errors from services because we return NotFound
                         // when a service doesn't return an object
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 76729e49f..1c0922ba0 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -59,25 +59,15 @@ export async function saveSession({
     submitAfterSave = false,
     createUnscheduledStatusWorkOrderForPIA = false,
 }) {
-    var saveSessionPromise;
-    if (store.getters.applicationUser.saveSessionPromise) {
-        // queue newest request after current saveSessionPromise resolves
-        saveSessionPromise = store.getters.applicationUser.saveSessionPromise.then(() => {
-            // get a new saveSessionPromise
-            return saveSessionHelper(
-                pageNameToLog,
-                submitAfterSave,
-                createUnscheduledStatusWorkOrderForPIA
-            );
-        });
-    } else {
-        // create an initial saveSessionPromise
-        saveSessionPromise = saveSessionHelper(
+    // Add next save session to end of queue
+    const saveSessionPromise = flushSaveSessionQueue().then(() => {
+        return saveSessionHelper(
             pageNameToLog,
             submitAfterSave,
             createUnscheduledStatusWorkOrderForPIA
         );
-    }
+    });
+
     store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise);
     // await here to allow for a caller to await and make the function synchronous
     if (!store.getters.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
@@ -133,7 +123,7 @@ async function loadSession(
     pageNameToLog
 ) {
     // await the saveSessionPromise in the store to make sure we're loading up to date information
-    await store.getters.applicationUser.saveSessionPromise;
+    await flushSaveSessionQueue();
 
     const response = await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.LOAD_SESSION,
@@ -193,3 +183,7 @@ async function saveSessionHelper(
     // Update the cookie with the referral information when saved.
     updateOrCreateFunnelCookie();
 }
+
+export async function flushSaveSessionQueue() {
+    return Promise.resolve(store.getters.applicationUser.saveSessionPromise);
+}
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 54020b7b0..6a82ea26c 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -137,7 +137,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -193,7 +193,10 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
@@ -442,18 +445,14 @@ export default {
             ) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else if (matchingCars.length === 1) {
                 await this.navigateForwardWithSingleCarMatch();
             } else {
-                this.$router.navigateWithSaving(
+                this.$router.navigateWithPageData(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                    this.$route,
-                    {},
-                    {},
+                    this.pageName,
                     carsFound
                 );
             }
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index f44cdc65a..e094f6147 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -82,7 +82,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -166,7 +166,10 @@ export default {
             return false;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             const vinLookup = await this.dispatchStoreActionWithLogging(
@@ -205,9 +208,7 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index b1f159fbe..a64f7a416 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -37,7 +37,7 @@ export default {
     name: "bailout",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 1896513a1..e04f0f18e 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 40736b2c2..e65eacc3c 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -123,6 +123,7 @@ import experimentMixin from "@/mixins/experiment-mixin.js";
 import { containsRecalParts } from "@/helpers/recal-helper.js";
 import donationBlock from "@/experiment-components/donation-block.vue";
 import { partNumberStrings } from "@/constants/part-number-strings";
+import analyticsMixin from "@/mixins/analytics-mixin";
 
 export default {
     name: "confirmation",
@@ -179,7 +180,7 @@ export default {
 
         // Call APIs
         const submittedOrder = baseMixin.methods.getSubmittedOrder();
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_WIPERS,
@@ -244,6 +245,8 @@ export default {
             vm.showDonationSuccess = lineItemsFromSubmittedOrder.supportingItems?.some(
                 (item) => item.partType === partNumberStrings.DONATION
             );
+
+            vm.pushAnalytics();
         });
     },
     data() {
@@ -556,6 +559,16 @@ export default {
                 this.$refs.donationBlock.removeLoader();
             }
         },
+        pushAnalytics() {
+            //Push Ecommerce Cart to Data Layer
+            analyticsMixin.methods.pushECommerceCartToDataLayer();
+
+            //Push Product Array to Data Layer
+            analyticsMixin.methods.pushProductArrayToDataLayer();
+
+            //Push Commission Junction Gtm Data To Data Layer
+            analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
+        },
     },
     components: {
         funnelHeader,
diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue
index baa8636be..8cb17673b 100644
--- a/src/layouts/customer-details/customer-details.vue
+++ b/src/layouts/customer-details/customer-details.vue
@@ -84,6 +84,7 @@ import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import store from "@/store";
 import { paymentMethods } from "@/constants/payment-method-constants";
+import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
@@ -102,7 +103,7 @@ export default {
     name: "customer-details",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -157,7 +158,10 @@ export default {
             return store.getters.order.serviceLocation.techNotes;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             this.dispatchStoreAction(
@@ -186,10 +190,13 @@ export default {
                     paymentMethods.NONE,
                     false
                 );
-                await store.getters.applicationUser.saveSessionPromise;
+                await flushSaveSessionQueue();
             }
 
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
     },
     components: {
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index b9fdf1958..0a5db7d74 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,6 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -89,7 +90,7 @@ export default {
 
     async beforeRouteEnter(to, from, next) {
         //Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const queryString = window.location.search;
         const urlParams = new URLSearchParams(queryString);
@@ -98,9 +99,9 @@ export default {
             lowerCaseParams.append(name.toLowerCase(), value);
         }
 
-        const zip = lowerCaseParams.get(queryStrings.ZIP_CODE)
-            ? lowerCaseParams.get(queryStrings.ZIP_CODE)
-            : store.getters.order.serviceLocation.zipCode;
+        const zip =
+            consumeQueryFromStash(queryStrings.ZIP_CODE) ??
+            store.getters.order.serviceLocation.zipCode;
 
         var vinByAddressPromise;
         if (zip) {
@@ -184,32 +185,35 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.MANUALVIN) {
                 await this.dispatchStoreAction(storeActions.CLEAR_VIN);
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_MANUAL_VIN,
-                    this.$route
+                    this.pageName
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.LICENSEPLATE) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_LICENSE_PLATE,
-                    this.$route
+                    this.pageName
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.HOMEADDRESS) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_HOME_ADDRESS,
-                    this.$route
+                    this.pageName
                 );
             }
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.DECLINE) {
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_NO_VIN,
-                    this.$route
+                    this.pageName
                 );
             }
         },
diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index c9409eb71..7efde9a68 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -58,6 +58,7 @@ import { experimentSettings } from "@/constants/experiments";
 import { partNumberStrings } from "@/constants/part-number-strings";
 import { deepClone } from "@/helpers/object-helper";
 import store from "@/store";
+import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 
 export default {
     name: "insurance-company",
@@ -81,7 +82,7 @@ export default {
         }
 
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         const insuranceCompanyListPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_INSURANCE_COMPANY_LIST,
             {},
@@ -146,18 +147,20 @@ export default {
             // Go back to Quote page
             if (forceCashSelectionOnQuote) {
                 this.$router.navigateWithoutSaving(
-                    this.navigationScenarios.CLICKED_BACK,
-                    this.$route,
-                    { isCashSelected: true }
+                    this.navigationScenarios.CLICKED_PAY_ON_MY_OWN,
+                    this.pageName
                 );
                 return;
             }
 
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
-            await store.getters.applicationUser.saveSessionPromise;
+            await flushSaveSessionQueue();
 
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 223ca9ee7..a6bb07bab 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -119,6 +119,8 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
 defineRule("license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED));
@@ -138,7 +140,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -163,7 +165,8 @@ export default {
     data() {
         return {
             licensePlate: this.getLicensePlateFromStore(),
-            registrationZipCode: this.getRegistrationZipFromStore() ?? this.$route.query.zipcode,
+            registrationZipCode:
+                this.getRegistrationZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
             emailOrSms: this.getEmailOrSmsFromStore(),
             serviceZipCode: this.getServiceZipFromStore(),
             carId: this.getCarIdfromStore(),
@@ -187,7 +190,10 @@ export default {
         },
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
@@ -392,9 +398,7 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 2c5f5a7c3..82b1e1619 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 1d7771474..89568fa37 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -47,7 +47,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index d5c7d93c3..d07434c1f 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,6 +168,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -179,7 +180,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const lineItemsFromStore = deepClone(store.getters.order.lineItems);
 
@@ -281,7 +282,7 @@ export default {
         const oldActivePromos = store.getters.lineItems.promos?.slice(0);
         const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
-        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
+        const promoCodeFromQueryString = consumeQueryFromStash(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
@@ -374,7 +375,7 @@ export default {
         doesCopyContainRouterLink,
         getRouterLinkRouteFromCopy,
         navigateWithScenario(scenarioName) {
-            this.$router.navigateWithoutSaving(scenarioName, this.$route);
+            this.$router.navigateWithoutSaving(scenarioName, this.pageName);
         },
         arePagePrerequisitesValid() {
             // Service Location
@@ -537,7 +538,10 @@ export default {
             return this.$store.getters.order.isRecalAckOptIn;
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         async forwardButtonAction() {
             this.forwardClicked = true;
@@ -575,16 +579,14 @@ export default {
                 await submitWorkOrder({ pageNameToLog: "payment-method", submitAfterSave: true });
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_FORWARD,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: false }
+                    this.pageName
                 );
             } else {
                 if (this.paymentMethod == paymentMethods.INSURANCE) {
                     this.dispatchStoreAction(this.storeActions.SAVE_PAYMENT_TYPE, true, false);
                     return this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_INSURANCE,
-                        this.$route
+                        this.pageName
                     );
                 } else {
                     this.setupPia();
@@ -603,16 +605,14 @@ export default {
             } catch (error) {
                 console.log("error: response from pia submit work order:" + error.message);
                 this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] = true;
+                this.$route.query.piaError = true;
                 return;
             }
 
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_PAY_NOW,
-                this.$route,
-                {},
-                { [routerParams.DISPLAY_PIA_ALERT]: false }
+                this.pageName
             );
         },
         hasSubmittedOrder() {
@@ -797,10 +797,7 @@ export default {
             return this.paymentMethodInternalModel;
         },
         shouldDisplayPiaAlert() {
-            return (
-                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] ||
-                getBoolFromString(window.history.state.displayPiaAlert)
-            );
+            return getBoolFromString(this.$route?.query?.piaError);
         },
         // Necessary to make the watcher of lineItems work
         // JavaScript does not keep a record of the old value, only a reference to it's location in the memory.
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index f0b4433ea..b39726948 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -39,20 +39,22 @@ export default {
                 store.getters.order.payment.piaType === paymentMethods.APPLE_PAY ||
                 store.getters.order.payment.piaType === paymentMethods.AFTERPAY;
             if (paymentPageNavScenario) {
-                this.$router.navigateWithoutSaving(
-                    this.navigationScenarios.PIA_CC_ERROR,
-                    this.$route,
-                    {
-                        [queryStrings.DISPLAY_PIA_ALERT]: store.getters.order.payment.piaType,
-                    }
+                const scenarios = {
+                    [paymentMethods.CREDIT_CARD]: this.navigationScenarios.PIA_CC_ERROR,
+                    [paymentMethods.APPLE_PAY]: this.navigationScenarios.PIA_APPLE_ERROR,
+                    [paymentMethods.AFTERPAY]: this.navigationScenarios.PIA_AFTERPAY_ERROR,
+                };
+
+                const relevantScenario = scenarios[store.getters.order.payment.piaType];
+
+                await this.$router.navigateAndForceTopLevelNavigation(
+                    relevantScenario,
+                    this.pageName
                 );
             } else {
-                this.$router.navigateWithoutSaving(
+                await this.$router.navigateAndForceTopLevelNavigation(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
-                    {
-                        [queryStrings.DISPLAY_PIA_ALERT]: true,
-                    }
+                    this.pageName
                 );
             }
         } else {
@@ -84,11 +86,9 @@ export default {
                     } else {
                         var msg = "Unknown Pia type: " + store.getters.order.payment.piaType;
                         console.log(msg);
-                        this.$router.navigateWithoutSaving(
+                        await this.$router.navigateAndForceTopLevelNavigation(
                             this.navigationScenarios.PIA_ERROR,
-                            this.$route,
-                            {},
-                            { [routerParams.DISPLAY_PIA_ALERT]: true }
+                            this.pageName
                         );
                     }
                 }
@@ -123,11 +123,9 @@ export default {
                         " " +
                         store.getters.order.referralSequenceNumber
                 );
-                this.$router.navigateWithoutSaving(
+                this.$router.navigateAndForceTopLevelNavigation(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 const expMonth = getQuerystringParameter(queryStrings.CARD_EXPIRATION_MONTH);
@@ -181,11 +179,9 @@ export default {
                 });
             } catch (error) {
                 console.log("error: response from submit work order:" + error.message);
-                this.$router.navigateWithoutSaving(
+                this.$router.navigateAndForceTopLevelNavigation(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: true }
+                    this.pageName
                 );
                 this.$refs.loadingModal.isModalVisible = false;
                 return;
@@ -193,7 +189,10 @@ export default {
 
             this.$refs.loadingModal.isModalVisible = false;
             await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
-            this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route);
+            this.$router.navigateAndForceTopLevelNavigation(
+                this.navigationScenarios.PIA_SUCCESS,
+                this.pageName
+            );
         },
     },
     components: {
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 3c87f85f2..f2bdb6733 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -289,7 +289,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const signaturePromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_SIGNATURE,
@@ -684,12 +684,16 @@ export default {
                 });
 
                 await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
-                window.location = applicationConfig.CONFIRMATION_URL;
+                this.$router.navigateAndForceTopLevelNavigation(
+                    this.navigationScenarios.CLICKED_PAY_LATER,
+                    this.pageName
+                );
+                //window.location = applicationConfig.CONFIRMATION_URL;
             } catch (error) {
                 console.log("error: response from submit work order(payment pg):" + error.message);
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.$route,
+                    this.pageName,
                     {},
                     { [routerParams.DISPLAY_PIA_ALERT]: true }
                 );
@@ -698,16 +702,13 @@ export default {
             }
         },
         backButtonAction() {
-            // The only way I could figure out how to get navigation to work on a page with the iframe.
-            // This is also how a cancel from Paypal would work.  Just a redirect to the payment-method page.
-            // The normal navigation sort of works but the page does not render.  The "next" callback function does not get
-            // invoked in payment-method's beforeroute enter.  I also spotted an error in vue-router.esm-bundler.js when this
-            // happens but was unable to ignore it with a try catch.  The navigation guard error is:
-            // Error: Redirected from "/?fmgPage=payment-method" to "{ params: {isSavingNation: "false"}, query: "fmgPage: "payment-method"}"
-            // I don't know if the navigation guard thinks the to and from are the same page.
-            // Also tried overriding with a $router.push
-            window.location = applicationConfig.PIA_CANCEL_URL;
-            //this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            // Used to set the url directly here.
+            // Now hooks into a shared set of logic for doing this, also used with `payment-pia-return`.
+            // And uses nav scenarios properly.
+            this.$router.navigateAndForceTopLevelNavigation(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         submitHopForm() {
             this.$nextTick(() => {
@@ -804,10 +805,7 @@ export default {
             }
         },
         shouldDisplayPiaAlert(payMethod) {
-            return (
-                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] === payMethod ||
-                getBoolFromString(window.history.state.displayPiaAlert)
-            );
+            return this.$route?.query?.piaErrorType === payMethod;
         },
     },
     components: {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 663f778c1..f100a9f32 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -169,17 +169,23 @@ import {
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
 const INSURANCE_TAB_TO_DISPLAY_THRESHOLD_DEFAULT = 300;
 
+const ACCEPTED_QUOTE_TYPES = {
+    CASH: "cash",
+    INSURANCE: "insurance",
+};
+
 export default {
     name: "quote",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_WIPERS,
             {
@@ -216,7 +222,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.query.fmgPage,
+                    pageName: to.name,
                     experiment: skipQuoteExperiment,
                 },
                 "quote",
@@ -246,7 +252,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.query.fmgPage,
+                    pageName: to.name,
                     experiment: afterpayBreakoutDisplayExperiment,
                 },
                 "quote",
@@ -353,7 +359,7 @@ export default {
         const oldActivePromos = store.getters.lineItems.promos?.slice(0);
         const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
-        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
+        const promoCodeFromQueryString = consumeQueryFromStash(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
@@ -403,10 +409,15 @@ export default {
             }
 
             const getIsInsuranceSelectedValue = (availableLineItems, insuranceThreshold) => {
-                // query param checked here is set on insurance-selection "Pay on my own" link click
-                if (to.query?.isCashSelected || to.query?.iscashselected) {
+                // Override auto-select if specified
+                const quoteTypeParam = to.query?.offer?.toLowerCase();
+
+                if (quoteTypeParam === ACCEPTED_QUOTE_TYPES.CASH) {
                     return false;
+                } else if (quoteTypeParam === ACCEPTED_QUOTE_TYPES.INSURANCE) {
+                    return true;
                 }
+
                 const serviceLocationState = store.getters.order.serviceLocation.state;
 
                 // usually true when returning from heritage but can be false when returning from heritage on a save quote
@@ -760,12 +771,12 @@ export default {
             if (payment.isInsurance) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_CASH,
-                    this.$route
+                    this.pageName
                 );
             }
 
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index d655a0c14..6b2a36f7e 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -55,7 +55,7 @@ export default {
     name: "return-user",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         // Settle promises and get results
         const promiseResultMap = [
             {
@@ -85,7 +85,7 @@ export default {
         async forwardButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_FORWARD,
-                this.$route
+                this.pageName
             );
         },
 
@@ -96,11 +96,9 @@ export default {
                 "Start over",
                 true
             );
-            deleteFunnelCookie();
-            await this.dispatchStoreAction(storeActions.RESET_STATE);
             this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_FORWARD,
-                this.$route
+                this.navigationScenarios.CLICKED_RESTART,
+                this.pageName
             );
         },
     },
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index ae05b9358..b47de1fa8 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -267,7 +267,7 @@ export default {
         }
 
         // Set up promises
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const alertReasonsPromise = locationAlerts.methods.loadInitialData(
             store.getters.order.serviceLocation.zipCodeCtu,
@@ -536,7 +536,10 @@ export default {
             }
         },
         backButtonAction() {
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
         forwardButtonAction() {
             this.updateSupportingItems();
@@ -585,7 +588,10 @@ export default {
                 );
             }
 
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
         setDisplayWaitList() {
             if (
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 3b37c8406..752d0c4c9 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -219,7 +219,7 @@ export default {
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const zipCodeDataPromise = getZipCodeData(serviceZipCode);
@@ -611,7 +611,7 @@ export default {
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.$route
+                    this.pageName
                 );
             }
         },
@@ -746,7 +746,10 @@ export default {
 
             this.updateAndSaveSupportingItems();
             this.updateAndSaveIsMSRFeeApplicable();
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
         setMobileLocationInValid(isMobileLocationInValid) {
             this.isMobileAddressValid = !isMobileLocationInValid;
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index ae6ff4ecf..16c6f7f72 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -96,6 +96,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -115,7 +116,7 @@ export default {
     mixins: [vinPagesMixin],
     data() {
         return {
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
+            serviceZipCode: this.getZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
             isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
@@ -127,7 +128,7 @@ export default {
 
     async beforeRouteEnter(to, from, next) {
         //Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         //Settle promises and get results
         const promiseResultMap = [
@@ -214,12 +215,12 @@ export default {
             if (skipVin) {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.$route
+                    this.pageName
                 );
             }
         },
@@ -317,7 +318,7 @@ export default {
                 await saveSession({ pageNameToLog: "service-zip" });
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 // if we're skipping the vin-lookup but it's not a repair, we still need to get the parts
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 46efb4728..488ad1eb4 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -110,7 +110,7 @@ export default {
     name: "vehicle-damage",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         const damageOptionsPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_DAMAGE_OPTIONS,
@@ -249,7 +249,10 @@ export default {
 
         backButtonAction() {
             // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
 
         getDamageLocationsFromStore() {
@@ -455,34 +458,26 @@ export default {
                 if (skipVin) {
                     this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                        this.$route,
-                        {},
-                        { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                        this.pageName
                     );
                 } else {
                     if (store.getters.damage.isRepair) {
                         this.$router.navigateWithSaving(
                             this.navigationScenarios
                                 .CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                            this.$route,
-                            {},
-                            { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                            this.pageName
                         );
                     } else {
                         if (store.getters.vehicle.vin) {
                             this.$router.navigateWithSaving(
                                 this.navigationScenarios
                                     .CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                                this.$route,
-                                {},
-                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                                this.pageName
                             );
                         } else {
                             this.$router.navigateWithSaving(
                                 this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                                this.$route,
-                                {},
-                                { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                                this.pageName
                             );
                         }
                     }
@@ -492,23 +487,17 @@ export default {
             else if (store.getters.vehicle.vin) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                    this.pageName
                 );
             } else if (skipVin) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false }
+                    this.pageName
                 );
             }
         },
@@ -637,7 +626,7 @@ export default {
             );
         },
         shouldDisplayVehicleChangeAlert() {
-            return getBoolFromString(window.history.state.displayVehicleChangeAlert);
+            return getBoolFromString(this.$route?.query?.displayVehicleChangeAlert);
         },
         shouldHideBackButton() {
             return this.$store.getters.requiresVerifiedRedirecting;
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index 280edfc6c..5f06391c1 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -154,7 +154,7 @@ export default {
         },
 
         PartDataFromApi() {
-            return this.$store.getters.pageData(this.$route.query.fmgPage) ?? {};
+            return this.$store.getters.pageData(this.pageName) ?? {};
         },
     },
     methods: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 4b68007f9..4298b74cb 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -81,7 +81,7 @@ export default {
     mixins: [vehicleQuestionsMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         // Settle promises and get results
         const promiseResultMap = [
             {
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index bad52fb02..1d2e7d2bb 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -110,6 +110,10 @@ import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { applicationConfig } from "../../constants/application-config";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import {
+    consumeQueryFromStash,
+    peekQueryFromStash,
+} from "@/router/a-rewrite/logic/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
@@ -133,7 +137,7 @@ export default {
             imageUrl: this.getImagefromStore(),
             imageVifNumber: this.getImageVifNumberfromStore(),
             imageVifColor: this.getImageVifColorfromStore(),
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
+            serviceZipCode: this.getZipFromStore() ?? peekQueryFromStash(queryStrings.ZIP_CODE),
             yearOptions: [],
             makeOptions: [],
             modelOptions: [],
@@ -154,7 +158,7 @@ export default {
             );
         }
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
         const experimentForLogging = store.getters.applicationUser.experiments.find(
             (e) => e.universeName === experimentUniverses.CONCEPT_FUNNEL
         );
@@ -213,7 +217,7 @@ export default {
                     userId: getUserIdValue(),
                     deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
-                    pageName: to.query.fmgPage,
+                    pageName: to.name,
                     experiment: experimentForLogging,
                 },
                 "vehicle",
@@ -536,7 +540,10 @@ export default {
                 }
             }
 
-            this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
         initializeYearComponent(initialData) {
             this.yearOptions = initialData;
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 23875e3e9..5db93d76d 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -160,6 +160,8 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -180,7 +182,7 @@ export default {
     mixins: [vinPagesMixin],
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -203,7 +205,7 @@ export default {
     data() {
         return {
             vin: this.getVinFromStore(),
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
+            serviceZipCode: this.getZipFromStore() ?? consumeQueryFromStash(queryStrings.ZIP_CODE),
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
             isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
@@ -247,12 +249,12 @@ export default {
             if (this.$store.getters.vehicle.vin) {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK_WITH_VIN,
-                    this.$route
+                    this.pageName
                 );
             } else {
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.CLICKED_BACK,
-                    this.$route
+                    this.pageName
                 );
             }
         },
@@ -474,9 +476,7 @@ export default {
             if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
                 this.$router.navigateWithSaving(
                     this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    this.$route,
-                    {},
-                    { [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: true }
+                    this.pageName
                 );
             } else {
                 await this.navigateForwardWithSingleCarMatch();
diff --git a/src/main.js b/src/main.js
index 1017651f8..5b823125b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import LoadScript from "vue-plugin-load-script";
 import Maska from "maska";
 import App from "./App.vue";
-import router from "./router";
+import router from "./router/a-rewrite";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 import analyticsMixin from "@/mixins/analytics-mixin.js";
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index b29eae8c1..e39908a8f 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -2,7 +2,7 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
 import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
@@ -15,6 +15,7 @@ export default {
     data() {
         return {
             cmsContentByWidget: {},
+            _componentPageName: null,
         };
     },
     methods: {
@@ -246,9 +247,15 @@ export default {
         cssClassNameForCmsWidget() {
             return "widget-name-" + this.cmsWidgetName;
         },
+        pageName() {
+            return this._componentPageName ?? this.$route.name;
+        },
     },
 
     mounted() {
+        // Store route immutably so that components know their originating page even during page transition.
+        this._componentPageName = this.$route.name;
+
         if (!store.getters.externalParameterState?.isExternalParameter) {
             showFmgLoadingModal(false);
         }
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 517fc7c90..ab39462ce 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -65,10 +65,10 @@ export default {
                 orderedVehicleQuestionPages.indexOf(fmgPage)
             );
         },
-        currentPageComesBeforePage(currentPage = this.$route.query.fmgPage, fmgPage) {
+        currentPageComesBeforePage(currentPage = this.pageName, fmgPage) {
             return this.comparePageIndices(currentPage, fmgPage) < 0;
         },
-        currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
+        currentPageComesAfterPage(currentPage = this.pageName, fmgPage) {
             return this.comparePageIndices(currentPage, fmgPage) > 0;
         },
         setupInitialData(glass, index, alreadyAnsweredQuestions, vm) {
@@ -359,7 +359,7 @@ export default {
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
         async navigateForward(partsOrQuestions, vm) {
             const self = vm ?? this;
-            const currentPage = self.$route.query.fmgPage;
+            const currentPage = self.pageName;
 
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
             const hasGlassLocationWithMultipleParts =
@@ -371,11 +371,9 @@ export default {
                 hasPartQuestions &&
                 this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)
             ) {
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -384,11 +382,9 @@ export default {
             ) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -397,11 +393,9 @@ export default {
             ) {
                 // if any childpart questions
                 // go to molding-questions page and pass the partsData
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions: partsOrQuestions }
                 );
             } else if (
@@ -438,11 +432,9 @@ export default {
                     }
                 }
 
-                self.$router.navigateWithSaving(
+                self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    self.$route,
-                    {},
-                    {},
+                    self.pageName,
                     { partsOrQuestions }
                 );
             } else {
@@ -477,7 +469,7 @@ export default {
                 } else {
                     self.$router.navigateWithSaving(
                         self.navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                        self.$route
+                        self.pageName
                     );
                 }
             }
@@ -485,7 +477,7 @@ export default {
         // Can't use `this` because navigateForward is also called from quote
         async navigateBack(vm) {
             const self = vm ?? this;
-            const currentPage = self.$route.query.fmgPage;
+            const currentPage = self.pageName;
             const pageDataCapabilityQuestions = self.$store.getters.pageData(
                 fmgPageValues.CAPABILITY_QUESTIONS
             );
@@ -539,7 +531,7 @@ export default {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
 
-            self.$router.navigateWithoutSaving(backNavigationScenario, self.$route);
+            self.$router.navigateWithoutSaving(backNavigationScenario, self.pageName);
         },
     },
 };
diff --git a/src/router/a-rewrite/constants/auto-route-table.js b/src/router/a-rewrite/constants/auto-route-table.js
new file mode 100644
index 000000000..0bf3503b9
--- /dev/null
+++ b/src/router/a-rewrite/constants/auto-route-table.js
@@ -0,0 +1,13 @@
+import { routeData } from "./routes";
+
+export const autoRouteTable = [
+    routeData.QUOTE,
+    routeData.CAPABILITY_QUESTIONS,
+    routeData.MOLDING_QUESTIONS,
+    routeData.VEHICLE_PARTS,
+    routeData.PART_QUESTIONS,
+    routeData.VIN_LOOKUP,
+    routeData.ESTIMATE,
+    routeData.VEHICLE_DAMAGE,
+    routeData.VEHICLE,
+];
diff --git a/src/router/a-rewrite/constants/navigation-scenarios.js b/src/router/a-rewrite/constants/navigation-scenarios.js
new file mode 100644
index 000000000..a6e117948
--- /dev/null
+++ b/src/router/a-rewrite/constants/navigation-scenarios.js
@@ -0,0 +1,69 @@
+/**
+ * We want to name these to describe the scenario rather than what page(s) they're used on.
+ *
+ * Naming convention: [PAST_TENSE_VERB]_[DESCRIPTOR_OF_STATE]
+ * ex: Rather than "HAS_PART_QUESTIONS", we might name the
+ *     scenario "CLICKED_FORWARD_WITH_PART_QUESTIONS"
+ */
+
+const navigationScenarios = {
+    // General
+    CLICKED_BACK: "CLICKED_BACK",
+    CLICKED_FORWARD: "CLICKED_FORWARD",
+    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
+    CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
+
+    // TODO: use virtual page?
+    // Vin selection
+    CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
+    CLICKED_BACK_WITH_SKIP_VIN: "CLICKED_BACK_WITH_SKIP_VIN",
+    CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
+    CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE:
+        "CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE",
+    CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE:
+        "CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE",
+    CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
+    CLICKED_FORWARD_WITH_SKIP_VIN: "CLICKED_FORWARD_WITH_SKIP_VIN",
+    CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES: "CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES",
+    SELECTED_VIN_WITH_MISMATCHED_GLASS: "SELECTED_VIN_WITH_MISMATCHED_GLASS",
+    SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
+    SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
+    SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
+    SELECTED_NO_VIN: "SELECTED_NO_VIN",
+    CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
+    CLICKED_VIN_RETRY: "CLICKED_VIN_RETRY",
+
+    // Part selection
+    CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
+    CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE",
+    CLICKED_FORWARD_WITH_MOLDING_QUESTIONS: "CLICKED_FORWARD_WITH_MOLDING_QUESTIONS",
+    CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS: "CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS",
+    CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS: "CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS",
+    CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
+    CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
+    CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
+    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
+    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
+    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
+
+    // Insurance-Company
+    CLICKED_PAY_ON_MY_OWN: "CLICKED_PAY_ON_MY_OWN",
+
+    // Schedule
+    CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
+
+    // Payment
+    CLICKED_INSURANCE: "CLICKED_INSURANCE",
+    CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
+    CLICKED_PAY_LATER: "CLICKED_PAY_LATER",
+    PIA_ERROR: "PIA_ERROR",
+    PIA_CC_ERROR: "PIA_CC_ERROR",
+    PIA_APPLE_ERROR: "PIA_APPLE_ERROR",
+    PIA_AFTERPAY_ERROR: "PIA_AFTERPAY_ERROR",
+    PIA_SUCCESS: "PIA_SUCCESS",
+
+    // Return User
+    CLICKED_RESTART: "CLICKED_RESTART",
+};
+
+export { navigationScenarios };
diff --git a/src/router/a-rewrite/constants/route-prefix.js b/src/router/a-rewrite/constants/route-prefix.js
new file mode 100644
index 000000000..7e5c6f1b9
--- /dev/null
+++ b/src/router/a-rewrite/constants/route-prefix.js
@@ -0,0 +1,3 @@
+export const ROUTE_PREFIX_TRIMMED = "fmg";
+
+export const ROUTE_PREFIX_FULL = `/${ROUTE_PREFIX_TRIMMED}/`;
diff --git a/src/router/a-rewrite/constants/routes.js b/src/router/a-rewrite/constants/routes.js
new file mode 100644
index 000000000..d03954867
--- /dev/null
+++ b/src/router/a-rewrite/constants/routes.js
@@ -0,0 +1,123 @@
+export const routeData = {
+    VEHICLE: {
+        name: "vehicle",
+        path: "/vehicle",
+    },
+    VEHICLE_DAMAGE: {
+        name: "vehicle-damage",
+        path: "/vehicle-damage",
+    },
+    ESTIMATE: {
+        name: "estimate",
+        path: "/estimate",
+    },
+    ADDRESS_LOOKUP: {
+        name: "address-lookup",
+        path: "/address-lookup",
+    },
+    VIN_LOOKUP: {
+        name: "vin-lookup",
+        path: "/vin-lookup",
+    },
+    LICENSE_PLATE_LOOKUP: {
+        name: "license-plate-lookup",
+        path: "/license-plate-lookup",
+    },
+    SERVICE_ZIP: {
+        name: "service-zip",
+        path: "/service-zip",
+    },
+    ADDRESS_VEHICLES: {
+        name: "address-vehicles",
+        path: "/address-vehicles",
+    },
+    VEHICLE_PARTS: {
+        name: "vehicle-parts",
+        path: "/vehicle-parts",
+    },
+    PART_QUESTIONS: {
+        name: "part-questions",
+        path: "/part-questions",
+    },
+    MOLDING_QUESTIONS: {
+        name: "molding-questions",
+        path: "/molding-questions",
+    },
+    CAPABILITY_QUESTIONS: {
+        name: "capability-questions",
+        path: "/capability-questions",
+    },
+    QUOTE: {
+        name: "quote",
+        path: "/quote",
+    },
+    INSURANCE_COMPANY: {
+        name: "insurance-company",
+        path: "/insurance-company",
+    },
+    SERVICE_LOCATION: {
+        name: "service-location",
+        path: "/service-location",
+    },
+    HERITAGE: {
+        name: "heritage",
+        path: "/virtual/heritage",
+        virtual: true,
+    },
+    SCHEDULE: {
+        name: "schedule",
+        path: "/schedule",
+    },
+    CUSTOMER_DETAILS: {
+        name: "customer-details",
+        path: "/customer-details",
+    },
+    PAYMENT_METHOD: {
+        name: "payment-method",
+        path: "/payment-method",
+    },
+    PAYMENT: {
+        name: "payment",
+        path: "/payment",
+    },
+    PAYMENT_PIA_RETURN: {
+        name: "payment-pia-return",
+        path: "/payment-pia-return",
+    },
+    CONFIRMATION: {
+        name: "confirmation",
+        path: "/confirmation",
+    },
+    RETURN_USER: {
+        name: "return-user",
+        path: "/return-user",
+    },
+    LOAD_SESSION: {
+        name: "load-session",
+        path: "/virtual/load-session",
+        virtual: true,
+    },
+    LANDING: {
+        name: "landing",
+        path: "/",
+        virtual: true,
+    },
+    AUTO_ROUTE: {
+        name: "auto-route",
+        path: "/virtual/auto-route",
+        virtual: true,
+    },
+    // TODO: RENAME FROM BAILOUT
+    ERROR: {
+        name: "error",
+        path: "/virtual/error",
+        virtual: true,
+    },
+    RESTART: {
+        name: "restart",
+        path: "/virtual/restart",
+        virtual: true,
+    },
+};
+
+export const FUNNEL_START_PAGE = routeData.VEHICLE;
diff --git a/src/router/a-rewrite/constants/routing-table.js b/src/router/a-rewrite/constants/routing-table.js
new file mode 100644
index 000000000..10ee7ae90
--- /dev/null
+++ b/src/router/a-rewrite/constants/routing-table.js
@@ -0,0 +1,596 @@
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import store from "@/store";
+import { paymentMethods } from "../../../constants/payment-method-constants";
+
+// Get as function to live-evaluate filters
+const routingTable = function () {
+    return [
+        {
+            pageName: routeData.VEHICLE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.VEHICLE_DAMAGE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.VEHICLE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario:
+                        navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario:
+                        navigationScenarios.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+            ],
+        },
+        {
+            pageName: routeData.VIN_LOOKUP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.LICENSE_PLATE_LOOKUP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.ADDRESS_LOOKUP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
+                    destinationPageData: routeData.ADDRESS_VEHICLES,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.ADDRESS_VEHICLES.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ADDRESS_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                    params: {
+                        displayVehicleChangeAlert: true,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.ESTIMATE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
+                    destinationPageData: routeData.LICENSE_PLATE_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
+                    destinationPageData: routeData.ADDRESS_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_NO_VIN,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+            ],
+        },
+        {
+            pageName: routeData.SERVICE_ZIP.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
+                    destinationPageData: routeData.VEHICLE_DAMAGE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.PART_QUESTIONS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.VEHICLE_PARTS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.MOLDING_QUESTIONS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.CAPABILITY_QUESTIONS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.QUOTE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.QUOTE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationPageData: routeData.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationPageData: routeData.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationPageData: routeData.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationPageData: routeData.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
+                    destinationPageData: routeData.CAPABILITY_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
+                    destinationPageData: routeData.SERVICE_LOCATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
+                    destinationPageData: routeData.INSURANCE_COMPANY,
+                },
+            ],
+        },
+        {
+            pageName: routeData.INSURANCE_COMPANY.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_ON_MY_OWN,
+                    destinationPageData: routeData.QUOTE,
+                    params: {
+                        offer: "cash",
+                    },
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.INSURANCE_DETAILS,
+                },
+            ],
+        },
+        {
+            pageName: routeData.SERVICE_LOCATION.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.QUOTE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.SCHEDULE,
+                },
+            ],
+        },
+        {
+            pageName: routeData.SCHEDULE.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.SERVICE_LOCATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.CUSTOMER_DETAILS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
+                    destinationPageData: routeData.SERVICE_LOCATION,
+                },
+            ],
+        },
+        {
+            pageName: routeData.CUSTOMER_DETAILS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.SCHEDULE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_NOW,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                },
+            ],
+        },
+        {
+            pageName: routeData.PAYMENT_METHOD.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.CUSTOMER_DETAILS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_NOW,
+                    destinationPageData: routeData.PAYMENT,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_INSURANCE,
+                    destinationPageData: routeData.INSURANCE_COMPANY,
+                },
+            ],
+        },
+        {
+            pageName: routeData.PAYMENT.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
+                {
+                    scenario: navigationScenarios.PIA_ERROR,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                    params: {
+                        piaError: "true",
+                    },
+                },
+            ],
+        },
+        {
+            pageName: routeData.PAYMENT_PIA_RETURN.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.PIA_ERROR,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                    params: {
+                        piaError: "true",
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_CC_ERROR,
+                    destinationPageData: routeData.PAYMENT,
+                    params: {
+                        piaErrorType: paymentMethods.CREDIT_CARD,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_APPLE_ERROR,
+                    destinationPageData: routeData.PAYMENT,
+                    params: {
+                        piaErrorType: paymentMethods.APPLE_PAY,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_AFTERPAY_ERROR,
+                    destinationPageData: routeData.PAYMENT,
+                    params: {
+                        piaErrorType: paymentMethods.AFTERPAY,
+                    },
+                },
+                {
+                    scenario: navigationScenarios.PIA_SUCCESS,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
+            ],
+        },
+        {
+            pageName: routeData.CONFIRMATION.name,
+        },
+        {
+            pageName: routeData.RETURN_USER.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.LOAD_SESSION,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_RESTART,
+                    destinationPageData: routeData.RESTART,
+                },
+            ],
+        },
+    ];
+};
+
+export { routingTable };
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
new file mode 100644
index 000000000..3a84a1730
--- /dev/null
+++ b/src/router/a-rewrite/index.js
@@ -0,0 +1,421 @@
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { createRoute, createVirtualRoute } from "@/router/a-rewrite/logic/create-route";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { createWebHistory, createRouter } from "vue-router";
+import { getDestination } from "@/router/a-rewrite/logic/get-destination";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import {
+    getFunnelCookie,
+    deleteFunnelCookie,
+    updateOrCreateFunnelCookie,
+} from "@/helpers/heritage-integration/cookie-helper";
+import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
+import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
+import store from "@/store";
+import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations";
+import { sessionStorageKeyConstants } from "@/constants/session-storage";
+import { savePageData } from "@/router/a-rewrite/logic/save-page-data";
+import eventBus from "@/helpers/event-bus/event-bus";
+import { globalEvents, globalEventTypes } from "@/constants/events";
+import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
+import { queryStrings } from "@/constants/query-strings";
+import { consumeReferralQuerystrings } from "@/router/a-rewrite/logic/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/a-rewrite/logic/initialize-from-querystrings";
+import { getBoolFromString } from "@/helpers/boolean-helper";
+import { isVerifiedInsurance } from "@/router/a-rewrite/logic/requires-verified-redirect";
+import baseMixin from "@/mixins/base-mixin";
+import { runExperiments } from "@/router/a-rewrite/logic/run-experiments";
+import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
+import { buildManualUrl } from "@/router/a-rewrite/logic/build-manual-url";
+import { consumeQueryFromStash, stashAllQueries } from "@/router/a-rewrite/logic/querystring-stash";
+
+const routes = [
+    // Non-virtual pages.
+    createRoute(routeData.VEHICLE, async (to, from) => {
+        // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
+        const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
+        if (hasVehicleChanged) {
+            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
+        }
+
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.VEHICLE_DAMAGE.name,
+                replace: true,
+            };
+        }
+    }),
+    createRoute(routeData.VEHICLE_DAMAGE),
+    createRoute(routeData.ESTIMATE),
+    createRoute(routeData.ADDRESS_LOOKUP),
+    createRoute(routeData.VIN_LOOKUP),
+    createRoute(routeData.LICENSE_PLATE_LOOKUP),
+    createRoute(routeData.SERVICE_ZIP),
+    createRoute(routeData.ADDRESS_VEHICLES),
+    createRoute(routeData.VEHICLE_PARTS),
+    createRoute(routeData.PART_QUESTIONS),
+    createRoute(routeData.MOLDING_QUESTIONS),
+    createRoute(routeData.CAPABILITY_QUESTIONS),
+    createRoute(routeData.QUOTE, async (to, from) => {
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.HERITAGE.name,
+                replace: true,
+            };
+        }
+
+        const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
+
+        if (offerQuote === "true") {
+            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
+        }
+    }),
+    createRoute(routeData.INSURANCE_COMPANY, async (to, from) => {
+        if (isVerifiedInsurance()) {
+            return {
+                name: routeData.HERITAGE.name,
+                replace: true,
+            };
+        }
+    }),
+    createRoute(routeData.SERVICE_LOCATION),
+    createRoute(routeData.SCHEDULE),
+    createRoute(routeData.CUSTOMER_DETAILS),
+    createRoute(routeData.PAYMENT_METHOD),
+    createRoute(routeData.PAYMENT),
+    createRoute(routeData.PAYMENT_PIA_RETURN),
+    createRoute(routeData.CONFIRMATION),
+    createRoute(routeData.RETURN_USER),
+
+    // Virtual pages (resolve to a non-virtual page.)
+    createVirtualRoute(routeData.LANDING, async (to, from) => {
+        await initializeFromQueryStrings();
+        // Save querystrings to temporary stash so they can be referred to later.
+        stashAllQueries(to);
+        // Change referral info. For use in local testing for insurance crossover.
+        await consumeReferralQuerystrings();
+
+        // Check for fmgpage parameter
+        const fmgPage = to?.query?.fmgPage;
+        if (fmgPage && router.hasRoute(fmgPage)) {
+            return {
+                name: fmgPage,
+                replace: true,
+            };
+        }
+
+        // If a session is still in memory, go to return-user.
+        if (store.getters.vehicle?.year > 0) {
+            console.log(`trying to redirect!`);
+            return {
+                name: routeData.RETURN_USER.name,
+                replace: true,
+            };
+        }
+
+        // Otherwise, load session and auto-route
+        return {
+            name: routeData.LOAD_SESSION.name,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.HERITAGE, async (to, from) => {
+        await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
+    }),
+    createVirtualRoute(routeData.LOAD_SESSION, async (to, from) => {
+        const loadSessionResponse = await loadSessionIfPresent(false, to.name);
+
+        return {
+            name: routeData.AUTO_ROUTE.name,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.AUTO_ROUTE, async (to, from) => {
+        for (let i = 0; i < autoRouteTable.length; i++) {
+            const testRouteData = autoRouteTable[i];
+
+            const isReady = await router.checkPagePrerequisites(testRouteData.name);
+
+            if (isReady) {
+                return {
+                    name: testRouteData.name,
+                    replace: true,
+                };
+            }
+        }
+
+        return {
+            name: FUNNEL_START_PAGE,
+            replace: true,
+        };
+    }),
+    createVirtualRoute(routeData.ERROR, async (to, from) => {
+        // If we've already encountered one error, clear session to avoid more.
+        // Otherwise mark that we encoutnered an error here.
+        if (store.getters.applicationUser.hasAlreadyTriggeredError) {
+            return {
+                name: routeData.RESTART.name,
+                replace: true,
+            };
+        } else {
+            await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
+        }
+
+        // Add error event to bus
+        eventBus.addEventToBus(
+            globalEvents.Categories.GLOBAL_ALERT,
+            globalEvents.SubCategories.UNKNOWN_ERROR,
+            {
+                isDismissable: true,
+                messageCopy: "",
+                messageHeadline: "We're sorry, something went wrong.",
+                type: globalEventTypes.Danger,
+            }
+        );
+
+        let nextPage = FUNNEL_START_PAGE.name;
+
+        baseMixin.methods?.ResetExternalParamsAndHideModal();
+
+        if (store.getters.payment?.insuranceCoverage?.isVerified) {
+            nextPage = routeData.VEHICLE_DAMAGE.name;
+        }
+
+        if (from.name === nextPage) {
+            // Router won't load the page if we redirect to the already existing page
+            // Force refresh in this scenario.
+            router.go(0);
+            return false;
+        }
+
+        return {
+            name: nextPage,
+            replace: false,
+        };
+    }),
+    createVirtualRoute(routeData.RESTART, async (to, from) => {
+        await store.dispatch(storeActions.RESET_STATE);
+        deleteFunnelCookie();
+
+        if (from.name === FUNNEL_START_PAGE.name) {
+            // Router won't load the page if we redirect to the already existing page
+            // Force refresh in this scenario.
+            router.go(0);
+            return false;
+        }
+
+        return {
+            name: FUNNEL_START_PAGE.name,
+            replace: true,
+        };
+    }),
+];
+
+const router = createRouter({
+    history: createWebHistory(ROUTE_PREFIX_FULL),
+    routes,
+    // Scroll to top on navigation.
+    scrollBehavior(to, from, savedPosition) {
+        return { top: 0 };
+    },
+});
+
+////-- Global Guards
+
+router.beforeEach(async (to, from) => {
+    console.log(to);
+    try {
+        await analyticsMixin.methods.validateSession();
+
+        if (getFunnelCookie()?.SuppressConceptFunnel) {
+            // Redirect to heritage.
+            return {
+                name: routeData.HERITAGE.name,
+            };
+        }
+
+        // Ensure session has not expired
+        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
+            const errorPayload = {
+                cause: "expired session",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            router.bailout(errorPayload, true);
+            return false;
+        }
+
+        // Block navigation if an order has been submitted.
+        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
+            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
+                return false;
+            }
+        }
+
+        // Process funnel cookie.
+        updateOrCreateFunnelCookie();
+
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
+        // Ensure page-prerequisites are fulfilled
+        const arePagePrerequisitesValid = await router.checkPagePrerequisites(to.name);
+
+        if (!arePagePrerequisitesValid) {
+            const errorPayload = {
+                cause: "invalid page prerequisites for page",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            router.bailout(errorPayload);
+            return;
+        }
+
+        await runExperiments(to.name);
+    } catch (error) {
+        const errorPayload = {
+            cause: "Uncaught exception in `beforeEach`.",
+            currentPage: from?.name,
+            nextPage: to?.name,
+        };
+
+        console.log(error);
+
+        router.bailout(errorPayload);
+        return;
+    }
+});
+
+router.afterEach(async (to, from) => {
+    // Push page view to GA
+    analyticsMixin.methods.pushPageViewToGA();
+
+    // Push experiments to Data Layer
+    analyticsMixin.methods.pushExperimentsToDataLayer();
+
+    // Push current order status to Data Layer
+    analyticsMixin.methods.pushOrderToDataLayer();
+});
+
+////-- End Global Guards
+
+////-- Bound Functions
+
+router.getRoute = (pageName) => {
+    return router.getRoutes().find((r) => r.name === pageName);
+};
+
+router.checkPagePrerequisites = async (pageName) => {
+    const route = router.getRoute(pageName);
+
+    if (!route) {
+        return false;
+    }
+
+    let component = route.components;
+
+    // Virtual routes have no component, so skip check.
+    if (!component) {
+        return true;
+    }
+
+    if (component?.default?.methods === undefined) {
+        component = await component?.default();
+    }
+
+    return component?.default?.methods?.arePagePrerequisitesValid();
+};
+
+router.navigateWithoutSaving = async (scenario, currentPageName) => {
+    return await router.navigate(currentPageName, scenario, false);
+};
+
+router.navigateWithSaving = async (scenario, currentPageName) => {
+    return await router.navigate(currentPageName, scenario, true);
+};
+
+router.navigateWithPageData = async (scenario, currentPageName, pageData = {}) => {
+    const nextPage = getDestination(currentPageName, scenario);
+    await savePageData(nextPage.name, pageData);
+
+    return await router.navigate(currentPageName, scenario, true);
+};
+
+router.navigateAndForceTopLevelNavigation = async (scenario, currentPageName, saving = false) => {
+    return await router.navigate(currentPageName, scenario, saving, true);
+};
+
+router.bailout = (errorPayload, forceRestart = false) => {
+    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+
+    if (forceRestart) {
+        router.push({
+            name: routeData.RESTART.name,
+        });
+    } else {
+        router.push({
+            name: routeData.ERROR.name,
+        });
+    }
+};
+
+router.navigate = async (
+    currentPageName,
+    scenario,
+    withSaving = false,
+    forceTopLevelNav = false
+) => {
+    // Check to see if calling page is same as current page.
+    // If not, cancel navigation before it begins.
+    const callingRoute = currentPageName;
+    const actualRoute = router.currentRoute.value.name;
+
+    if (callingRoute !== actualRoute) {
+        return false;
+    }
+
+    const nextPage = getDestination(currentPageName, scenario);
+
+    if (!nextPage) {
+        console.error(
+            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
+        );
+
+        const errorPayload = {
+            cause: "invalid page name",
+            currentPage: currentPageName,
+            nextPage: nextPage?.name,
+        };
+
+        router.bailout(errorPayload);
+        return;
+    }
+
+    if (withSaving) {
+        await saveSession({ pageNameToLog: nextPage.name });
+    }
+
+    // Some pages require manually setting the next url
+    // to work with iframes.
+    if (forceTopLevelNav) {
+        const newUrl = buildManualUrl(nextPage);
+        window.top.location.href = newUrl;
+        return;
+    }
+
+    // All other pages use router.push
+    router.push({
+        name: nextPage.name,
+        query: nextPage.params ?? {},
+    });
+};
+
+////-- End Router Functions
+
+export default router;
diff --git a/src/router/a-rewrite/logic/build-manual-url.js b/src/router/a-rewrite/logic/build-manual-url.js
new file mode 100644
index 000000000..017816d6b
--- /dev/null
+++ b/src/router/a-rewrite/logic/build-manual-url.js
@@ -0,0 +1,27 @@
+import { ROUTE_PREFIX_TRIMMED } from "@/router/a-rewrite/constants/route-prefix";
+
+export function buildManualUrl(nextPage) {
+    const queries = nextPage.params;
+    const querystring = buildSearchParams(queries);
+
+    const url = `${window.top.location.origin}/${ROUTE_PREFIX_TRIMMED}${nextPage.path}${querystring}`;
+
+    return url;
+}
+
+function buildSearchParams(paramList) {
+    if (!paramList) {
+        return "";
+    }
+
+    const keys = Object.keys(paramList);
+    if (keys?.length > 0) {
+        const queryFormattedParams = keys.map((k) => `${k}=${paramList[k]}`);
+
+        const querystring = queryFormattedParams.reduce((a, b) => `${a}&${b}`);
+
+        return `?${querystring}`;
+    }
+
+    return "";
+}
diff --git a/src/router/a-rewrite/logic/consume-referral-info.js b/src/router/a-rewrite/logic/consume-referral-info.js
new file mode 100644
index 000000000..5c1dceafc
--- /dev/null
+++ b/src/router/a-rewrite/logic/consume-referral-info.js
@@ -0,0 +1,18 @@
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { queryStrings } from "@/constants/query-strings";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
+import { updateOrCreateFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+
+export async function consumeReferralQuerystrings() {
+    const referralNumber = getQuerystringParameter(queryStrings.REFERRAL_NUMBER);
+    const parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
+    const correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
+    if (referralNumber) {
+        store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
+        store.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccount);
+        store.commit(storeMutations.UPDATE_REFERRAL_CORRELATION_ID, correlationId);
+        // log(" --update cookie");
+        updateOrCreateFunnelCookie();
+    }
+}
diff --git a/src/router/a-rewrite/logic/create-route.js b/src/router/a-rewrite/logic/create-route.js
new file mode 100644
index 000000000..44e27b568
--- /dev/null
+++ b/src/router/a-rewrite/logic/create-route.js
@@ -0,0 +1,39 @@
+import { lazyLoadComponent } from "@/router/a-rewrite/logic/lazy-load-component";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+
+export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
+    return {
+        name: routeDatum.name,
+        path: routeDatum.path,
+        component: lazyLoadComponent(routeDatum.name),
+        beforeEnter: async (to, from) => {
+            try {
+                return await beforeEnter(to, from);
+            } catch {
+                return {
+                    name: routeData.BAILOUT.name,
+                    replace: true,
+                };
+            }
+        },
+    };
+}
+
+export function createVirtualRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
+    return {
+        name: routeDatum.name,
+        path: routeDatum.path,
+        beforeEnter: async (to, from) => {
+            try {
+                return await beforeEnter(to, from);
+            } catch (error) {
+                console.log(error);
+                return {
+                    name: routeData.BAILOUT.name,
+                    replace: true,
+                };
+            }
+        },
+        virtual: true,
+    };
+}
diff --git a/src/router/a-rewrite/logic/get-destination.js b/src/router/a-rewrite/logic/get-destination.js
new file mode 100644
index 000000000..cd04ddaad
--- /dev/null
+++ b/src/router/a-rewrite/logic/get-destination.js
@@ -0,0 +1,18 @@
+import { routingTable } from "@/router/a-rewrite/constants/routing-table";
+
+export function getDestination(sourcePageName, navigationScenario) {
+    const table = routingTable();
+
+    const pageEntry = table.find((entry) => entry.pageName === sourcePageName);
+
+    const map = pageEntry?.maps?.find((map) => map.scenario === navigationScenario);
+
+    if (!map || map?.filter === false) {
+        return null;
+    }
+
+    return {
+        ...map.destinationPageData,
+        params: map.params,
+    };
+}
diff --git a/src/router/a-rewrite/logic/initialize-from-querystrings.js b/src/router/a-rewrite/logic/initialize-from-querystrings.js
new file mode 100644
index 000000000..2e12f88eb
--- /dev/null
+++ b/src/router/a-rewrite/logic/initialize-from-querystrings.js
@@ -0,0 +1,121 @@
+import {
+    setupAdvertiserTracking,
+    getAffiliateCookies,
+} from "@/helpers/heritage-integration/cookie-helper";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
+import { storeActions } from "@/constants/store-actions";
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { queryStrings } from "@/constants/query-strings";
+import { externalParameterStatus } from "@/constants/external-parameters";
+
+export async function initializeFromQueryStrings() {
+    // Get advertiser info
+    setupAdvertisersAndAffiliates();
+
+    // Read all external paramter queries and write to store.
+    updateExternalParameterState();
+}
+
+function setupAdvertisersAndAffiliates() {
+    const affiliateCookies = getAffiliateCookies();
+    if (affiliateCookies != null && affiliateCookies.length > 0) {
+        store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
+    }
+    setupAdvertiserTracking();
+}
+
+function updateExternalParameterState() {
+    const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
+    const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
+    const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
+    const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
+    const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
+    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
+    const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
+    const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
+    const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
+    const externalParameterServicePackage = getQuerystringParameter(queryStrings.SERVICE_PACKAGE);
+    const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
+    const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
+    const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
+    if (
+        externalParameterYear &&
+        externalParameterMake &&
+        externalParameterModel &&
+        externalParameterStyle
+    ) {
+        resetStoreForExternalParameter();
+        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
+    }
+    if (
+        externalParameterDamage &&
+        (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR" ||
+            externalParameterNumberOfChips?.length > 0)
+    ) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_DAMAGE_TYPE, externalParameterDamage);
+        if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPLACE") {
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, false);
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS, null);
+        } else if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPAIR") {
+            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, true);
+            store.commit(
+                storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS,
+                externalParameterNumberOfChips
+            );
+        }
+    }
+    if (externalParameterZipCode) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
+    }
+    if (externalParameterEmail) {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
+            externalParameterEmail
+        );
+    }
+    if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE,
+            externalParameterServicePackage?.toLowerCase()
+        );
+    }
+    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
+            externalParameterVinSelection
+        );
+    }
+    if (externalParameterSource) {
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_SOURCE, externalParameterSource);
+    }
+    if (externalParameterPhoneNumber) {
+        store.commit(
+            storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
+            externalParameterPhoneNumber
+        );
+    }
+}
+
+// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
+// are returning.  clear out prior related things that need to be selected again like parts and damage type.
+function resetStoreForExternalParameter() {
+    if (
+        store.getters.externalParameterState?.isExternalParameter ==
+        externalParameterStatus.INACTIVE
+    ) {
+        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
+        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
+            state: null,
+            zipCode: null,
+            zipCodeCtu: null,
+        });
+        store.dispatch(storeActions.SAVE_EMAIL, null);
+        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+    }
+}
diff --git a/src/router/a-rewrite/logic/lazy-load-component.js b/src/router/a-rewrite/logic/lazy-load-component.js
new file mode 100644
index 000000000..cb91c06c0
--- /dev/null
+++ b/src/router/a-rewrite/logic/lazy-load-component.js
@@ -0,0 +1,3 @@
+export function lazyLoadComponent(componentName) {
+    return () => import(`@/layouts/${componentName}/${componentName}.vue`);
+}
diff --git a/src/router/a-rewrite/logic/querystring-stash.js b/src/router/a-rewrite/logic/querystring-stash.js
new file mode 100644
index 000000000..96b206572
--- /dev/null
+++ b/src/router/a-rewrite/logic/querystring-stash.js
@@ -0,0 +1,58 @@
+import { reactive } from "vue";
+
+const queryStash = reactive({
+    queries: [],
+});
+
+function stash(key, value) {
+    const existingValue = getStashedQuery(key);
+
+    if (existingValue) {
+        existingValue.value = value;
+        existingValue.used = false;
+        return;
+    }
+
+    queryStash.queries.push({
+        key: key,
+        value: value,
+        used: false,
+    });
+}
+
+export function stashAllQueries(toRoute) {
+    const keys = Object.keys(toRoute.query);
+
+    keys.forEach((k) => stash(k, toRoute.query[k]));
+}
+
+function getStashedQuery(key) {
+    const match = queryStash.queries.find(
+        (entry) => entry?.key?.toLowerCase() === key?.toLowerCase()
+    );
+
+    return match;
+}
+
+export function peekQueryFromStash(key) {
+    return getStashedQuery(key)?.value;
+}
+
+export function consumeQueryFromStash(key) {
+    const match = getStashedQuery(key);
+
+    if (match) {
+        if (!match.used) {
+            match.used = true;
+            return match.value;
+        }
+
+        return null;
+    }
+
+    return null;
+}
+
+export function clearStash() {
+    queryStash.queries = [];
+}
diff --git a/src/router/a-rewrite/logic/requires-verified-redirect.js b/src/router/a-rewrite/logic/requires-verified-redirect.js
new file mode 100644
index 000000000..19f088687
--- /dev/null
+++ b/src/router/a-rewrite/logic/requires-verified-redirect.js
@@ -0,0 +1,8 @@
+import store from "@/store";
+
+export function isVerifiedInsurance() {
+    return (
+        store.getters.payment?.insuranceCoverage?.isVerified ||
+        store.getters.order?.referralNumber?.length === 6
+    );
+}
diff --git a/src/router/a-rewrite/logic/run-experiments.js b/src/router/a-rewrite/logic/run-experiments.js
new file mode 100644
index 000000000..97472ad0c
--- /dev/null
+++ b/src/router/a-rewrite/logic/run-experiments.js
@@ -0,0 +1,30 @@
+import store from "@/store";
+import baseMixin from "@/mixins/base-mixin";
+import { storeActions } from "@/constants/store-actions";
+import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
+import { experimentTriggers } from "@/constants/experiments";
+import { applicationConfig } from "@/constants/application-config";
+
+export async function runExperiments(nextPageName) {
+    if (!store.getters.applicationUser.triggeredSiteEntry) {
+        await baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
+            {
+                deviceId: getDeviceIdValue(),
+                triggerEvent: experimentTriggers.SITE_ENTRY,
+                triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
+            },
+            nextPageName
+        );
+    }
+
+    await baseMixin.methods.dispatchStoreActionWithLogging(
+        storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
+        {
+            deviceId: getDeviceIdValue(),
+            triggerEvent: experimentTriggers.PAGE_ENTRY,
+            triggerValue: nextPageName,
+        },
+        nextPageName
+    );
+}
diff --git a/src/router/a-rewrite/logic/save-page-data.js b/src/router/a-rewrite/logic/save-page-data.js
new file mode 100644
index 000000000..1299f8900
--- /dev/null
+++ b/src/router/a-rewrite/logic/save-page-data.js
@@ -0,0 +1,11 @@
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
+
+export async function savePageData(page, data) {
+    const existingPageData = store.getters.pageData(page);
+
+    const dataToSave = Object.keys(data).length > 0 ? data : (existingPageData ?? {});
+
+    // Save data if non-null
+    store.commit(storeMutations.UPDATE_PAGE_DATA, { page: page, data: dataToSave });
+}
diff --git a/src/store/index.js b/src/store/index.js
index 753d8509b..468a9e9eb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -199,6 +199,7 @@ const getDefaultState = () => {
             triggeredSiteEntry: false,
             affiliateCookies: [],
             loggingOption: false,
+            hasAlreadyTriggeredError: false,
         },
     };
 };
@@ -824,6 +825,9 @@ export const mutations = {
     updateAffiliateCookies(state, affiliateCookies) {
         state.applicationUser.affiliateCookies = affiliateCookies;
     },
+    updateHasTriggeredError(state, hasTriggeredError) {
+        state.applicationUser.hasAlreadyTriggeredError = hasTriggeredError;
+    },
 };
 
 // Export Getters
@@ -3428,6 +3432,10 @@ export const actions = {
             }
         }
     },
+
+    updateHasTriggeredError(context, hasAlreadyTriggeredError) {
+        context.commit(storeMutations.UPDATE_HAS_TRIGGERED_ERROR, hasAlreadyTriggeredError);
+    },
 };
 
 export default createStore({

From d89f61a5b71fbd0e9aeb8580abf2ea6eb0a6d373 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:36:13 -0400
Subject: [PATCH 52/64] Reapply "Big split"

This reverts commit 0b80154cd9bf6cafed54079eb3cadaec7d941a1b.
---
 src/layouts/estimate/estimate.vue             |   2 +-
 .../license-plate-lookup.vue                  |   2 +-
 src/layouts/payment-method/payment-method.vue |   2 +-
 src/layouts/quote/quote.vue                   |   2 +-
 src/layouts/service-zip/service-zip.vue       |   2 +-
 src/layouts/vehicle/vehicle.vue               |   2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |   2 +-
 .../a-rewrite/constants/externalUrl-values.js |   6 +
 src/router/a-rewrite/index.js                 | 425 +-----------------
 src/router/a-rewrite/methods/after-each.js    |  12 +
 src/router/a-rewrite/methods/before-each.js   |  83 ++++
 src/router/a-rewrite/methods/error.js         |  17 +
 src/router/a-rewrite/methods/get-route.js     |   5 +
 .../helpers}/build-manual-url.js              |   2 +-
 .../helpers}/consume-referral-info.js         |   0
 .../helpers}/create-route.js                  |   2 +-
 .../helpers}/get-destination.js               |   0
 .../helpers}/initialize-from-querystrings.js  |   0
 .../helpers}/lazy-load-component.js           |   0
 .../helpers}/querystring-stash.js             |   0
 .../helpers}/requires-verified-redirect.js    |   0
 .../helpers}/run-experiments.js               |   0
 .../helpers}/save-page-data.js                |   0
 .../a-rewrite/methods/navigate-external.js    |  10 +
 src/router/a-rewrite/methods/navigate.js      |  84 ++++
 .../a-rewrite/methods/page-prerequisites.js   |  22 +
 .../methods/route-logic/auto-route.js         |  23 +
 .../a-rewrite/methods/route-logic/error.js    |  52 +++
 .../a-rewrite/methods/route-logic/heritage.js |   5 +
 .../methods/route-logic/insurance-company.js  |  11 +
 .../a-rewrite/methods/route-logic/landing.js  |  38 ++
 .../methods/route-logic/load-session.js       |  11 +
 .../a-rewrite/methods/route-logic/quote.js    |  20 +
 .../a-rewrite/methods/route-logic/restart.js  |  22 +
 .../a-rewrite/methods/route-logic/vehicle.js  |  21 +
 src/router/a-rewrite/methods/routes.js        |  46 ++
 36 files changed, 518 insertions(+), 413 deletions(-)
 create mode 100644 src/router/a-rewrite/constants/externalUrl-values.js
 create mode 100644 src/router/a-rewrite/methods/after-each.js
 create mode 100644 src/router/a-rewrite/methods/before-each.js
 create mode 100644 src/router/a-rewrite/methods/error.js
 create mode 100644 src/router/a-rewrite/methods/get-route.js
 rename src/router/a-rewrite/{logic => methods/helpers}/build-manual-url.js (93%)
 rename src/router/a-rewrite/{logic => methods/helpers}/consume-referral-info.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/create-route.js (92%)
 rename src/router/a-rewrite/{logic => methods/helpers}/get-destination.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/initialize-from-querystrings.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/lazy-load-component.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/querystring-stash.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/requires-verified-redirect.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/run-experiments.js (100%)
 rename src/router/a-rewrite/{logic => methods/helpers}/save-page-data.js (100%)
 create mode 100644 src/router/a-rewrite/methods/navigate-external.js
 create mode 100644 src/router/a-rewrite/methods/navigate.js
 create mode 100644 src/router/a-rewrite/methods/page-prerequisites.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/auto-route.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/error.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/heritage.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/insurance-company.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/landing.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/load-session.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/quote.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/restart.js
 create mode 100644 src/router/a-rewrite/methods/route-logic/vehicle.js
 create mode 100644 src/router/a-rewrite/methods/routes.js

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 0a5db7d74..66d1544d9 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index a6bb07bab..673116965 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -119,7 +119,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index d07434c1f..51a3ffd5d 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,7 +168,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index f100a9f32..c095d00be 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -169,7 +169,7 @@ import {
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 16c6f7f72..6e0bccda6 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -96,7 +96,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 1d2e7d2bb..8686be85b 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -113,7 +113,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import {
     consumeQueryFromStash,
     peekQueryFromStash,
-} from "@/router/a-rewrite/logic/querystring-stash";
+} from "@/router/a-rewrite/methods/helpers/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 5db93d76d..277e176f5 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -160,7 +160,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/logic/querystring-stash";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
diff --git a/src/router/a-rewrite/constants/externalUrl-values.js b/src/router/a-rewrite/constants/externalUrl-values.js
new file mode 100644
index 000000000..5516095c4
--- /dev/null
+++ b/src/router/a-rewrite/constants/externalUrl-values.js
@@ -0,0 +1,6 @@
+const externalUrls = {
+    HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
+    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
+};
+
+export { externalUrls };
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
index 3a84a1730..37bd5aa0d 100644
--- a/src/router/a-rewrite/index.js
+++ b/src/router/a-rewrite/index.js
@@ -1,216 +1,16 @@
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { createRoute, createVirtualRoute } from "@/router/a-rewrite/logic/create-route";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { createWebHistory, createRouter } from "vue-router";
-import { getDestination } from "@/router/a-rewrite/logic/get-destination";
-import analyticsMixin from "@/mixins/analytics-mixin";
+import { routes } from "@/router/a-rewrite/methods/routes";
+import { afterEach } from "@/router/a-rewrite/methods/after-each";
+import { beforeEach } from "@/router/a-rewrite/methods/before-each";
+import { bailout } from "@/router/a-rewrite/methods/error";
 import {
-    getFunnelCookie,
-    deleteFunnelCookie,
-    updateOrCreateFunnelCookie,
-} from "@/helpers/heritage-integration/cookie-helper";
-import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
-import store from "@/store";
-import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
-import { sessionStorageKeyConstants } from "@/constants/session-storage";
-import { savePageData } from "@/router/a-rewrite/logic/save-page-data";
-import eventBus from "@/helpers/event-bus/event-bus";
-import { globalEvents, globalEventTypes } from "@/constants/events";
-import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
-import { queryStrings } from "@/constants/query-strings";
-import { consumeReferralQuerystrings } from "@/router/a-rewrite/logic/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/a-rewrite/logic/initialize-from-querystrings";
-import { getBoolFromString } from "@/helpers/boolean-helper";
-import { isVerifiedInsurance } from "@/router/a-rewrite/logic/requires-verified-redirect";
-import baseMixin from "@/mixins/base-mixin";
-import { runExperiments } from "@/router/a-rewrite/logic/run-experiments";
+    navigateWithoutSaving,
+    navigateWithSaving,
+    navigateWithPageData,
+    navigateAndForceTopLevelNavigation,
+} from "@/router/a-rewrite/methods/navigate";
+import { navigateToExternalUrl } from "@/router/a-rewrite/methods/navigate-external";
+import { createWebHistory, createRouter } from "vue-router";
 import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
-import { buildManualUrl } from "@/router/a-rewrite/logic/build-manual-url";
-import { consumeQueryFromStash, stashAllQueries } from "@/router/a-rewrite/logic/querystring-stash";
-
-const routes = [
-    // Non-virtual pages.
-    createRoute(routeData.VEHICLE, async (to, from) => {
-        // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
-        const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
-        if (hasVehicleChanged) {
-            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
-        }
-
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.VEHICLE_DAMAGE.name,
-                replace: true,
-            };
-        }
-    }),
-    createRoute(routeData.VEHICLE_DAMAGE),
-    createRoute(routeData.ESTIMATE),
-    createRoute(routeData.ADDRESS_LOOKUP),
-    createRoute(routeData.VIN_LOOKUP),
-    createRoute(routeData.LICENSE_PLATE_LOOKUP),
-    createRoute(routeData.SERVICE_ZIP),
-    createRoute(routeData.ADDRESS_VEHICLES),
-    createRoute(routeData.VEHICLE_PARTS),
-    createRoute(routeData.PART_QUESTIONS),
-    createRoute(routeData.MOLDING_QUESTIONS),
-    createRoute(routeData.CAPABILITY_QUESTIONS),
-    createRoute(routeData.QUOTE, async (to, from) => {
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.HERITAGE.name,
-                replace: true,
-            };
-        }
-
-        const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
-
-        if (offerQuote === "true") {
-            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
-        }
-    }),
-    createRoute(routeData.INSURANCE_COMPANY, async (to, from) => {
-        if (isVerifiedInsurance()) {
-            return {
-                name: routeData.HERITAGE.name,
-                replace: true,
-            };
-        }
-    }),
-    createRoute(routeData.SERVICE_LOCATION),
-    createRoute(routeData.SCHEDULE),
-    createRoute(routeData.CUSTOMER_DETAILS),
-    createRoute(routeData.PAYMENT_METHOD),
-    createRoute(routeData.PAYMENT),
-    createRoute(routeData.PAYMENT_PIA_RETURN),
-    createRoute(routeData.CONFIRMATION),
-    createRoute(routeData.RETURN_USER),
-
-    // Virtual pages (resolve to a non-virtual page.)
-    createVirtualRoute(routeData.LANDING, async (to, from) => {
-        await initializeFromQueryStrings();
-        // Save querystrings to temporary stash so they can be referred to later.
-        stashAllQueries(to);
-        // Change referral info. For use in local testing for insurance crossover.
-        await consumeReferralQuerystrings();
-
-        // Check for fmgpage parameter
-        const fmgPage = to?.query?.fmgPage;
-        if (fmgPage && router.hasRoute(fmgPage)) {
-            return {
-                name: fmgPage,
-                replace: true,
-            };
-        }
-
-        // If a session is still in memory, go to return-user.
-        if (store.getters.vehicle?.year > 0) {
-            console.log(`trying to redirect!`);
-            return {
-                name: routeData.RETURN_USER.name,
-                replace: true,
-            };
-        }
-
-        // Otherwise, load session and auto-route
-        return {
-            name: routeData.LOAD_SESSION.name,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.HERITAGE, async (to, from) => {
-        await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
-    }),
-    createVirtualRoute(routeData.LOAD_SESSION, async (to, from) => {
-        const loadSessionResponse = await loadSessionIfPresent(false, to.name);
-
-        return {
-            name: routeData.AUTO_ROUTE.name,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.AUTO_ROUTE, async (to, from) => {
-        for (let i = 0; i < autoRouteTable.length; i++) {
-            const testRouteData = autoRouteTable[i];
-
-            const isReady = await router.checkPagePrerequisites(testRouteData.name);
-
-            if (isReady) {
-                return {
-                    name: testRouteData.name,
-                    replace: true,
-                };
-            }
-        }
-
-        return {
-            name: FUNNEL_START_PAGE,
-            replace: true,
-        };
-    }),
-    createVirtualRoute(routeData.ERROR, async (to, from) => {
-        // If we've already encountered one error, clear session to avoid more.
-        // Otherwise mark that we encoutnered an error here.
-        if (store.getters.applicationUser.hasAlreadyTriggeredError) {
-            return {
-                name: routeData.RESTART.name,
-                replace: true,
-            };
-        } else {
-            await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
-        }
-
-        // Add error event to bus
-        eventBus.addEventToBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.UNKNOWN_ERROR,
-            {
-                isDismissable: true,
-                messageCopy: "",
-                messageHeadline: "We're sorry, something went wrong.",
-                type: globalEventTypes.Danger,
-            }
-        );
-
-        let nextPage = FUNNEL_START_PAGE.name;
-
-        baseMixin.methods?.ResetExternalParamsAndHideModal();
-
-        if (store.getters.payment?.insuranceCoverage?.isVerified) {
-            nextPage = routeData.VEHICLE_DAMAGE.name;
-        }
-
-        if (from.name === nextPage) {
-            // Router won't load the page if we redirect to the already existing page
-            // Force refresh in this scenario.
-            router.go(0);
-            return false;
-        }
-
-        return {
-            name: nextPage,
-            replace: false,
-        };
-    }),
-    createVirtualRoute(routeData.RESTART, async (to, from) => {
-        await store.dispatch(storeActions.RESET_STATE);
-        deleteFunnelCookie();
-
-        if (from.name === FUNNEL_START_PAGE.name) {
-            // Router won't load the page if we redirect to the already existing page
-            // Force refresh in this scenario.
-            router.go(0);
-            return false;
-        }
-
-        return {
-            name: FUNNEL_START_PAGE.name,
-            replace: true,
-        };
-    }),
-];
 
 const router = createRouter({
     history: createWebHistory(ROUTE_PREFIX_FULL),
@@ -221,201 +21,18 @@ const router = createRouter({
     },
 });
 
-////-- Global Guards
+// Set guards
+router.afterEach(async (to, from) => afterEach(to, from));
+router.beforeEach(async (to, from) => beforeEach(to, from));
 
-router.beforeEach(async (to, from) => {
-    console.log(to);
-    try {
-        await analyticsMixin.methods.validateSession();
+// Bind methods for external use
+router.navigateWithSaving = navigateWithSaving;
+router.navigateWithoutSaving = navigateWithoutSaving;
+router.navigateWithPageData = navigateWithPageData;
+router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
 
-        if (getFunnelCookie()?.SuppressConceptFunnel) {
-            // Redirect to heritage.
-            return {
-                name: routeData.HERITAGE.name,
-            };
-        }
+router.bailout = bailout;
 
-        // Ensure session has not expired
-        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
-            const errorPayload = {
-                cause: "expired session",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            router.bailout(errorPayload, true);
-            return false;
-        }
-
-        // Block navigation if an order has been submitted.
-        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
-            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
-                return false;
-            }
-        }
-
-        // Process funnel cookie.
-        updateOrCreateFunnelCookie();
-
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
-        // Ensure page-prerequisites are fulfilled
-        const arePagePrerequisitesValid = await router.checkPagePrerequisites(to.name);
-
-        if (!arePagePrerequisitesValid) {
-            const errorPayload = {
-                cause: "invalid page prerequisites for page",
-                currentPage: from?.name,
-                nextPage: to?.name,
-            };
-
-            router.bailout(errorPayload);
-            return;
-        }
-
-        await runExperiments(to.name);
-    } catch (error) {
-        const errorPayload = {
-            cause: "Uncaught exception in `beforeEach`.",
-            currentPage: from?.name,
-            nextPage: to?.name,
-        };
-
-        console.log(error);
-
-        router.bailout(errorPayload);
-        return;
-    }
-});
-
-router.afterEach(async (to, from) => {
-    // Push page view to GA
-    analyticsMixin.methods.pushPageViewToGA();
-
-    // Push experiments to Data Layer
-    analyticsMixin.methods.pushExperimentsToDataLayer();
-
-    // Push current order status to Data Layer
-    analyticsMixin.methods.pushOrderToDataLayer();
-});
-
-////-- End Global Guards
-
-////-- Bound Functions
-
-router.getRoute = (pageName) => {
-    return router.getRoutes().find((r) => r.name === pageName);
-};
-
-router.checkPagePrerequisites = async (pageName) => {
-    const route = router.getRoute(pageName);
-
-    if (!route) {
-        return false;
-    }
-
-    let component = route.components;
-
-    // Virtual routes have no component, so skip check.
-    if (!component) {
-        return true;
-    }
-
-    if (component?.default?.methods === undefined) {
-        component = await component?.default();
-    }
-
-    return component?.default?.methods?.arePagePrerequisitesValid();
-};
-
-router.navigateWithoutSaving = async (scenario, currentPageName) => {
-    return await router.navigate(currentPageName, scenario, false);
-};
-
-router.navigateWithSaving = async (scenario, currentPageName) => {
-    return await router.navigate(currentPageName, scenario, true);
-};
-
-router.navigateWithPageData = async (scenario, currentPageName, pageData = {}) => {
-    const nextPage = getDestination(currentPageName, scenario);
-    await savePageData(nextPage.name, pageData);
-
-    return await router.navigate(currentPageName, scenario, true);
-};
-
-router.navigateAndForceTopLevelNavigation = async (scenario, currentPageName, saving = false) => {
-    return await router.navigate(currentPageName, scenario, saving, true);
-};
-
-router.bailout = (errorPayload, forceRestart = false) => {
-    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-
-    if (forceRestart) {
-        router.push({
-            name: routeData.RESTART.name,
-        });
-    } else {
-        router.push({
-            name: routeData.ERROR.name,
-        });
-    }
-};
-
-router.navigate = async (
-    currentPageName,
-    scenario,
-    withSaving = false,
-    forceTopLevelNav = false
-) => {
-    // Check to see if calling page is same as current page.
-    // If not, cancel navigation before it begins.
-    const callingRoute = currentPageName;
-    const actualRoute = router.currentRoute.value.name;
-
-    if (callingRoute !== actualRoute) {
-        return false;
-    }
-
-    const nextPage = getDestination(currentPageName, scenario);
-
-    if (!nextPage) {
-        console.error(
-            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
-        );
-
-        const errorPayload = {
-            cause: "invalid page name",
-            currentPage: currentPageName,
-            nextPage: nextPage?.name,
-        };
-
-        router.bailout(errorPayload);
-        return;
-    }
-
-    if (withSaving) {
-        await saveSession({ pageNameToLog: nextPage.name });
-    }
-
-    // Some pages require manually setting the next url
-    // to work with iframes.
-    if (forceTopLevelNav) {
-        const newUrl = buildManualUrl(nextPage);
-        window.top.location.href = newUrl;
-        return;
-    }
-
-    // All other pages use router.push
-    router.push({
-        name: nextPage.name,
-        query: nextPage.params ?? {},
-    });
-};
-
-////-- End Router Functions
+router.navigateToExternalUrl = navigateToExternalUrl;
 
 export default router;
diff --git a/src/router/a-rewrite/methods/after-each.js b/src/router/a-rewrite/methods/after-each.js
new file mode 100644
index 000000000..ef3dc0d93
--- /dev/null
+++ b/src/router/a-rewrite/methods/after-each.js
@@ -0,0 +1,12 @@
+import analyticsMixin from "@/mixins/analytics-mixin";
+
+export async function afterEach(to, from) {
+    // Push page view to GA
+    analyticsMixin.methods.pushPageViewToGA();
+
+    // Push experiments to Data Layer
+    analyticsMixin.methods.pushExperimentsToDataLayer();
+
+    // Push current order status to Data Layer
+    analyticsMixin.methods.pushOrderToDataLayer();
+}
diff --git a/src/router/a-rewrite/methods/before-each.js b/src/router/a-rewrite/methods/before-each.js
new file mode 100644
index 000000000..05264ed3c
--- /dev/null
+++ b/src/router/a-rewrite/methods/before-each.js
@@ -0,0 +1,83 @@
+import { queryStrings } from "@/constants/query-strings";
+import { sessionStorageKeyConstants } from "@/constants/session-storage";
+import {
+    getFunnelCookie,
+    updateOrCreateFunnelCookie,
+} from "@/helpers/heritage-integration/cookie-helper";
+import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
+import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
+import analyticsMixin from "@/mixins/analytics-mixin";
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { runExperiments } from "@/router/a-rewrite/methods/helpers/run-experiments";
+
+import { bailout } from "@/router/a-rewrite/methods/error";
+import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+
+export async function beforeEach(to, from) {
+    try {
+        await analyticsMixin.methods.validateSession();
+
+        if (getFunnelCookie()?.SuppressConceptFunnel) {
+            // Redirect to heritage.
+            return {
+                name: routeData.HERITAGE.name,
+            };
+        }
+
+        // Ensure session has not expired
+        if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
+            const errorPayload = {
+                cause: "expired session",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            bailout(errorPayload, true);
+            return false;
+        }
+
+        // Block navigation if an order has been submitted.
+        if (window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !== null) {
+            if (to.name !== FUNNEL_START_PAGE.name && to.name !== routeData.CONFIRMATION.name) {
+                return false;
+            }
+        }
+
+        // Process funnel cookie.
+        updateOrCreateFunnelCookie();
+
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
+        // Ensure page-prerequisites are fulfilled
+        const arePagePrerequisitesValid = await checkPagePrerequisites(to.name);
+
+        if (!arePagePrerequisitesValid) {
+            const errorPayload = {
+                cause: "invalid page prerequisites for page",
+                currentPage: from?.name,
+                nextPage: to?.name,
+            };
+
+            bailout(errorPayload);
+            return;
+        }
+
+        await runExperiments(to.name);
+    } catch (error) {
+        const errorPayload = {
+            cause: "Uncaught exception in `beforeEach`.",
+            currentPage: from?.name,
+            nextPage: to?.name,
+        };
+
+        console.log(error);
+
+        bailout(errorPayload);
+        return;
+    }
+}
diff --git a/src/router/a-rewrite/methods/error.js b/src/router/a-rewrite/methods/error.js
new file mode 100644
index 000000000..3c50c1768
--- /dev/null
+++ b/src/router/a-rewrite/methods/error.js
@@ -0,0 +1,17 @@
+import analyticsMixin from "@/mixins/analytics-mixin";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import router from "@/router/a-rewrite";
+
+export async function bailout(errorPayload, forceRestart = false) {
+    analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
+
+    if (forceRestart) {
+        router.push({
+            name: routeData.RESTART.name,
+        });
+    } else {
+        router.push({
+            name: routeData.ERROR.name,
+        });
+    }
+}
diff --git a/src/router/a-rewrite/methods/get-route.js b/src/router/a-rewrite/methods/get-route.js
new file mode 100644
index 000000000..ead89eb5b
--- /dev/null
+++ b/src/router/a-rewrite/methods/get-route.js
@@ -0,0 +1,5 @@
+import router from "@/router/a-rewrite";
+
+export function getRoute(pageName) {
+    return router.getRoutes().find((r) => r.name === pageName);
+}
diff --git a/src/router/a-rewrite/logic/build-manual-url.js b/src/router/a-rewrite/methods/helpers/build-manual-url.js
similarity index 93%
rename from src/router/a-rewrite/logic/build-manual-url.js
rename to src/router/a-rewrite/methods/helpers/build-manual-url.js
index 017816d6b..260b41257 100644
--- a/src/router/a-rewrite/logic/build-manual-url.js
+++ b/src/router/a-rewrite/methods/helpers/build-manual-url.js
@@ -9,7 +9,7 @@ export function buildManualUrl(nextPage) {
     return url;
 }
 
-function buildSearchParams(paramList) {
+export function buildSearchParams(paramList) {
     if (!paramList) {
         return "";
     }
diff --git a/src/router/a-rewrite/logic/consume-referral-info.js b/src/router/a-rewrite/methods/helpers/consume-referral-info.js
similarity index 100%
rename from src/router/a-rewrite/logic/consume-referral-info.js
rename to src/router/a-rewrite/methods/helpers/consume-referral-info.js
diff --git a/src/router/a-rewrite/logic/create-route.js b/src/router/a-rewrite/methods/helpers/create-route.js
similarity index 92%
rename from src/router/a-rewrite/logic/create-route.js
rename to src/router/a-rewrite/methods/helpers/create-route.js
index 44e27b568..a1535f3c8 100644
--- a/src/router/a-rewrite/logic/create-route.js
+++ b/src/router/a-rewrite/methods/helpers/create-route.js
@@ -1,4 +1,4 @@
-import { lazyLoadComponent } from "@/router/a-rewrite/logic/lazy-load-component";
+import { lazyLoadComponent } from "@/router/a-rewrite/methods/helpers/lazy-load-component";
 import { routeData } from "@/router/a-rewrite/constants/routes";
 
 export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
diff --git a/src/router/a-rewrite/logic/get-destination.js b/src/router/a-rewrite/methods/helpers/get-destination.js
similarity index 100%
rename from src/router/a-rewrite/logic/get-destination.js
rename to src/router/a-rewrite/methods/helpers/get-destination.js
diff --git a/src/router/a-rewrite/logic/initialize-from-querystrings.js b/src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
similarity index 100%
rename from src/router/a-rewrite/logic/initialize-from-querystrings.js
rename to src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
diff --git a/src/router/a-rewrite/logic/lazy-load-component.js b/src/router/a-rewrite/methods/helpers/lazy-load-component.js
similarity index 100%
rename from src/router/a-rewrite/logic/lazy-load-component.js
rename to src/router/a-rewrite/methods/helpers/lazy-load-component.js
diff --git a/src/router/a-rewrite/logic/querystring-stash.js b/src/router/a-rewrite/methods/helpers/querystring-stash.js
similarity index 100%
rename from src/router/a-rewrite/logic/querystring-stash.js
rename to src/router/a-rewrite/methods/helpers/querystring-stash.js
diff --git a/src/router/a-rewrite/logic/requires-verified-redirect.js b/src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
similarity index 100%
rename from src/router/a-rewrite/logic/requires-verified-redirect.js
rename to src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
diff --git a/src/router/a-rewrite/logic/run-experiments.js b/src/router/a-rewrite/methods/helpers/run-experiments.js
similarity index 100%
rename from src/router/a-rewrite/logic/run-experiments.js
rename to src/router/a-rewrite/methods/helpers/run-experiments.js
diff --git a/src/router/a-rewrite/logic/save-page-data.js b/src/router/a-rewrite/methods/helpers/save-page-data.js
similarity index 100%
rename from src/router/a-rewrite/logic/save-page-data.js
rename to src/router/a-rewrite/methods/helpers/save-page-data.js
diff --git a/src/router/a-rewrite/methods/navigate-external.js b/src/router/a-rewrite/methods/navigate-external.js
new file mode 100644
index 000000000..622bf1e99
--- /dev/null
+++ b/src/router/a-rewrite/methods/navigate-external.js
@@ -0,0 +1,10 @@
+export function navigateToExternalUrl(url, optionalQuery = {}) {
+    // possibly show some loading screen in the future here.
+    var externalUrl = new URL(url);
+
+    for (const queryKey in optionalQuery) {
+        externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
+    }
+
+    window.location.assign(externalUrl);
+}
diff --git a/src/router/a-rewrite/methods/navigate.js b/src/router/a-rewrite/methods/navigate.js
new file mode 100644
index 000000000..ca8de4784
--- /dev/null
+++ b/src/router/a-rewrite/methods/navigate.js
@@ -0,0 +1,84 @@
+import { saveSession } from "@/helpers/heritage-integration/order-helper";
+import { buildManualUrl } from "@/router/a-rewrite/methods/helpers/build-manual-url";
+import { getDestination } from "@/router/a-rewrite/methods/helpers/get-destination";
+import { savePageData } from "@/router/a-rewrite/methods/helpers/save-page-data";
+import router from "@/router/a-rewrite";
+
+import { bailout } from "@/router/a-rewrite/methods/error";
+
+async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
+    console.log(`Navigate:\n
+        - scenario: ${scenario}\n
+        - currentPage: ${currentPageName}\n
+        - withSaving: ${withSaving}\n
+        - forceTopLevelNav: ${forceTopLevelNav}`);
+    
+    // Check to see if calling page is same as current page.
+    // If not, cancel navigation before it begins.
+    const callingRoute = currentPageName;
+    const actualRoute = router.currentRoute.value.name;
+
+    if (callingRoute !== actualRoute) {
+        return false;
+    }
+
+    const nextPage = getDestination(currentPageName, scenario);
+
+    if (!nextPage) {
+        console.error(
+            `Could not navigate from ${currentPageName} via scenario ${scenario}. Ensure routing table is configured correctly.`
+        );
+
+        const errorPayload = {
+            cause: "invalid page name",
+            currentPage: currentPageName,
+            nextPage: nextPage?.name,
+        };
+
+        bailout(errorPayload);
+        return;
+    }
+
+    if (withSaving) {
+        await saveSession({ pageNameToLog: nextPage.name });
+    }
+
+    // Some pages require manually setting the next url
+    // to work with iframes.
+    if (forceTopLevelNav) {
+        const newUrl = buildManualUrl(nextPage);
+        window.top.location.href = newUrl;
+        return;
+    }
+
+    // All other pages use router.push
+    router.push({
+        name: nextPage.name,
+        query: nextPage.params ?? {},
+    });
+}
+
+//// -- Aliases: what's actually called
+
+export async function navigateWithoutSaving(scenario, currentPageName) {
+    return await navigate(scenario, currentPageName, false);
+}
+
+export async function navigateWithSaving(scenario, currentPageName) {
+    return await navigate(scenario, currentPageName, true);
+}
+
+export async function navigateWithPageData(scenario, currentPageName, pageData = {}) {
+    const nextPage = getDestination(currentPageName, scenario);
+    await savePageData(nextPage.name, pageData);
+
+    return await navigate(scenario, currentPageName, true);
+}
+
+export async function navigateAndForceTopLevelNavigation(
+    scenario,
+    currentPageName,
+    saving = false
+) {
+    return await navigate(scenario, currentPageName, saving, true);
+}
diff --git a/src/router/a-rewrite/methods/page-prerequisites.js b/src/router/a-rewrite/methods/page-prerequisites.js
new file mode 100644
index 000000000..581ab0354
--- /dev/null
+++ b/src/router/a-rewrite/methods/page-prerequisites.js
@@ -0,0 +1,22 @@
+import { getRoute } from "@/router/a-rewrite/methods/get-route";
+
+export async function checkPagePrerequisites(pageName) {
+    const route = getRoute(pageName);
+
+    if (!route) {
+        return false;
+    }
+
+    let component = route.components;
+
+    // Virtual routes have no component, so skip check.
+    if (!component) {
+        return true;
+    }
+
+    if (component?.default?.methods === undefined) {
+        component = await component?.default();
+    }
+
+    return component?.default?.methods?.arePagePrerequisitesValid();
+}
diff --git a/src/router/a-rewrite/methods/route-logic/auto-route.js b/src/router/a-rewrite/methods/route-logic/auto-route.js
new file mode 100644
index 000000000..a6d55e4fa
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/auto-route.js
@@ -0,0 +1,23 @@
+import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
+import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+
+export async function autoRouteBeforeEnter(to, from) {
+    for (let i = 0; i < autoRouteTable.length; i++) {
+        const testRouteData = autoRouteTable[i];
+
+        const isReady = await checkPagePrerequisites(testRouteData.name);
+
+        if (isReady) {
+            return {
+                name: testRouteData.name,
+                replace: true,
+            };
+        }
+    }
+
+    return {
+        name: FUNNEL_START_PAGE,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/error.js b/src/router/a-rewrite/methods/route-logic/error.js
new file mode 100644
index 000000000..c4bdeb6d5
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/error.js
@@ -0,0 +1,52 @@
+import { globalEvents, globalEventTypes } from "@/constants/events";
+import { storeActions } from "@/constants/store-actions";
+import eventBus from "@/helpers/event-bus/event-bus";
+import baseMixin from "@/mixins/base-mixin";
+import router from "@/router/a-rewrite";
+import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import store from "@/store";
+
+export async function errorBeforeEnter(to, from) {
+    // If we've already encountered one error, clear session to avoid more.
+    // Otherwise mark that we encoutnered an error here.
+    if (store.getters.applicationUser.hasAlreadyTriggeredError) {
+        return {
+            name: routeData.RESTART.name,
+            replace: true,
+        };
+    } else {
+        await store.dispatch(storeActions.UPDATE_HAS_TRIGGERED_ERROR, true);
+    }
+
+    // Add error event to bus
+    eventBus.addEventToBus(
+        globalEvents.Categories.GLOBAL_ALERT,
+        globalEvents.SubCategories.UNKNOWN_ERROR,
+        {
+            isDismissable: true,
+            messageCopy: "",
+            messageHeadline: "We're sorry, something went wrong.",
+            type: globalEventTypes.Danger,
+        }
+    );
+
+    let nextPage = FUNNEL_START_PAGE.name;
+
+    baseMixin.methods?.ResetExternalParamsAndHideModal();
+
+    if (store.getters.payment?.insuranceCoverage?.isVerified) {
+        nextPage = routeData.VEHICLE_DAMAGE.name;
+    }
+
+    if (from.name === nextPage) {
+        // Router won't load the page if we redirect to the already existing page
+        // Force refresh in this scenario.
+        router.go(0);
+        return false;
+    }
+
+    return {
+        name: nextPage,
+        replace: false,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/heritage.js b/src/router/a-rewrite/methods/route-logic/heritage.js
new file mode 100644
index 000000000..d1a4c41c4
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/heritage.js
@@ -0,0 +1,5 @@
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+
+export async function heritageBeforeEnter(to, from) {
+    await navigateToHeritageFunnel({ shouldSaveSession: false, pageNameToLog: to.name });
+}
diff --git a/src/router/a-rewrite/methods/route-logic/insurance-company.js b/src/router/a-rewrite/methods/route-logic/insurance-company.js
new file mode 100644
index 000000000..18d961854
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/insurance-company.js
@@ -0,0 +1,11 @@
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+
+export async function insuranceCompanyBeforeEnter(to, from) {
+    if (isVerifiedInsurance()) {
+        return {
+            name: routeData.HERITAGE.name,
+            replace: true,
+        };
+    }
+}
diff --git a/src/router/a-rewrite/methods/route-logic/landing.js b/src/router/a-rewrite/methods/route-logic/landing.js
new file mode 100644
index 000000000..b71d7a9db
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/landing.js
@@ -0,0 +1,38 @@
+import router from "@/router/a-rewrite";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { consumeReferralQuerystrings } from "@/router/a-rewrite/methods/helpers/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/a-rewrite/methods/helpers/initialize-from-querystrings";
+import { stashAllQueries } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import store from "@/store";
+
+export async function landingBeforeEnter(to, from) {
+    await initializeFromQueryStrings();
+    // Save querystrings to temporary stash so they can be referred to later.
+    stashAllQueries(to);
+    // Change referral info. For use in local testing for insurance crossover.
+    await consumeReferralQuerystrings();
+
+    // Check for fmgpage parameter
+    const fmgPage = to?.query?.fmgPage;
+    if (fmgPage && router.hasRoute(fmgPage)) {
+        return {
+            name: fmgPage,
+            replace: true,
+        };
+    }
+
+    // If a session is still in memory, go to return-user.
+    if (store.getters.vehicle?.year > 0) {
+        console.log(`trying to redirect!`);
+        return {
+            name: routeData.RETURN_USER.name,
+            replace: true,
+        };
+    }
+
+    // Otherwise, load session and auto-route
+    return {
+        name: routeData.LOAD_SESSION.name,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/load-session.js b/src/router/a-rewrite/methods/route-logic/load-session.js
new file mode 100644
index 000000000..c70eb28d6
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/load-session.js
@@ -0,0 +1,11 @@
+import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+
+export async function loadSessionBeforeEnter(to, from) {
+    const loadSessionResponse = await loadSessionIfPresent(false, to.name);
+
+    return {
+        name: routeData.AUTO_ROUTE.name,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/quote.js b/src/router/a-rewrite/methods/route-logic/quote.js
new file mode 100644
index 000000000..9771b9bbb
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/quote.js
@@ -0,0 +1,20 @@
+import { queryStrings } from "@/constants/query-strings";
+import { storeMutations } from "@/constants/store-mutations";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import store from "@/store";
+
+export async function quoteBeforeEnter(to, from) {
+    if (isVerifiedInsurance()) {
+        return {
+            name: routeData.HERITAGE.name,
+            replace: true,
+        };
+    }
+
+    const offerQuote = to.query?.[queryStrings.OFFER_QUOTE];
+
+    if (offerQuote === "true") {
+        store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
+    }
+}
diff --git a/src/router/a-rewrite/methods/route-logic/restart.js b/src/router/a-rewrite/methods/route-logic/restart.js
new file mode 100644
index 000000000..4589999e0
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/restart.js
@@ -0,0 +1,22 @@
+import { storeActions } from "@/constants/store-actions";
+import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import router from "@/router/a-rewrite";
+import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import store from "@/store";
+
+export async function restartBeforeEnter(to, from) {
+    await store.dispatch(storeActions.RESET_STATE);
+    deleteFunnelCookie();
+
+    if (from.name === FUNNEL_START_PAGE.name) {
+        // Router won't load the page if we redirect to the already existing page
+        // Force refresh in this scenario.
+        router.go(0);
+        return false;
+    }
+
+    return {
+        name: FUNNEL_START_PAGE.name,
+        replace: true,
+    };
+}
diff --git a/src/router/a-rewrite/methods/route-logic/vehicle.js b/src/router/a-rewrite/methods/route-logic/vehicle.js
new file mode 100644
index 000000000..ed241d7de
--- /dev/null
+++ b/src/router/a-rewrite/methods/route-logic/vehicle.js
@@ -0,0 +1,21 @@
+import { storeMutations } from "@/constants/store-mutations";
+import { getBoolFromString } from "@/helpers/boolean-helper";
+import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import store from "@/store";
+
+export async function vehicleBeforeEnter(to, from) {
+    // If cookie indicates that vehicle has changed during insurance flow, reset parts info.
+    const hasVehicleChanged = getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration);
+    if (hasVehicleChanged) {
+        store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
+    }
+
+    if (isVerifiedInsurance()) {
+        return {
+            name: routeData.VEHICLE_DAMAGE.name,
+            replace: true,
+        };
+    }
+}
diff --git a/src/router/a-rewrite/methods/routes.js b/src/router/a-rewrite/methods/routes.js
new file mode 100644
index 000000000..5cbc8e94e
--- /dev/null
+++ b/src/router/a-rewrite/methods/routes.js
@@ -0,0 +1,46 @@
+import { createRoute, createVirtualRoute } from "@/router/a-rewrite/methods/helpers/create-route";
+import { routeData } from "@/router/a-rewrite/constants/routes";
+
+import { vehicleBeforeEnter } from "@/router/a-rewrite/methods/route-logic/vehicle";
+import { quoteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/quote";
+import { insuranceCompanyBeforeEnter } from "@/router/a-rewrite/methods/route-logic/insurance-company";
+import { landingBeforeEnter } from "@/router/a-rewrite/methods/route-logic/landing";
+import { heritageBeforeEnter } from "@/router/a-rewrite/methods/route-logic/heritage";
+import { loadSessionBeforeEnter } from "@/router/a-rewrite/methods/route-logic/load-session";
+import { autoRouteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/auto-route";
+import { errorBeforeEnter } from "@/router/a-rewrite/methods/route-logic/error";
+import { restartBeforeEnter } from "@/router/a-rewrite/methods/route-logic/restart";
+
+export const routes = [
+    // Non-virtual pages.
+    createRoute(routeData.VEHICLE, vehicleBeforeEnter),
+    createRoute(routeData.VEHICLE_DAMAGE),
+    createRoute(routeData.ESTIMATE),
+    createRoute(routeData.ADDRESS_LOOKUP),
+    createRoute(routeData.VIN_LOOKUP),
+    createRoute(routeData.LICENSE_PLATE_LOOKUP),
+    createRoute(routeData.SERVICE_ZIP),
+    createRoute(routeData.ADDRESS_VEHICLES),
+    createRoute(routeData.VEHICLE_PARTS),
+    createRoute(routeData.PART_QUESTIONS),
+    createRoute(routeData.MOLDING_QUESTIONS),
+    createRoute(routeData.CAPABILITY_QUESTIONS),
+    createRoute(routeData.QUOTE, quoteBeforeEnter),
+    createRoute(routeData.INSURANCE_COMPANY, insuranceCompanyBeforeEnter),
+    createRoute(routeData.SERVICE_LOCATION),
+    createRoute(routeData.SCHEDULE),
+    createRoute(routeData.CUSTOMER_DETAILS),
+    createRoute(routeData.PAYMENT_METHOD),
+    createRoute(routeData.PAYMENT),
+    createRoute(routeData.PAYMENT_PIA_RETURN),
+    createRoute(routeData.CONFIRMATION),
+    createRoute(routeData.RETURN_USER),
+
+    // Virtual pages (resolve to a non-virtual page.)
+    createVirtualRoute(routeData.LANDING, landingBeforeEnter),
+    createVirtualRoute(routeData.HERITAGE, heritageBeforeEnter),
+    createVirtualRoute(routeData.LOAD_SESSION, loadSessionBeforeEnter),
+    createVirtualRoute(routeData.AUTO_ROUTE, autoRouteBeforeEnter),
+    createVirtualRoute(routeData.ERROR, errorBeforeEnter),
+    createVirtualRoute(routeData.RESTART, restartBeforeEnter),
+];

From 81a709f716b7eee54059addbc75dd0eb972ff2a4 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:36:23 -0400
Subject: [PATCH 53/64] Reapply "Unplug Legacy Router"

This reverts commit 7b73313513094ff5921570fc14d5106198db0aa7.
---
 src/constants/application-config.js           |   1 +
 src/digital-components/modal/modal.vue        |   8 +-
 src/fmg-components/nav-bar/nav-bar.vue        |   9 +-
 src/global-methods.js                         |   2 +-
 .../heritage-integration/navigation-helper.js | 102 --
 src/helpers/unit-test-helper.js               |   6 +-
 src/layouts/address-lookup/address-lookup.vue |   5 +-
 .../address-vehicles/address-vehicles.vue     |   7 +-
 .../capability-questions.vue                  |   6 +-
 src/layouts/estimate/estimate.vue             |   2 +-
 .../license-plate-lookup.vue                  |   7 +-
 .../molding-questions/molding-questions.vue   |   6 +-
 src/layouts/part-questions/part-questions.vue |   6 +-
 src/layouts/payment-method/payment-method.vue |   3 +-
 .../payment-pia-return/payment-pia-return.vue |   1 -
 src/layouts/payment/payment.vue               |   8 +-
 src/layouts/quote/quote.vue                   |   8 +-
 src/layouts/service-zip/service-zip.vue       |   6 +-
 src/layouts/vehicle-damage/vehicle-damage.vue |   1 -
 src/layouts/vehicle-parts/vehicle-parts.vue   |   6 +-
 src/layouts/vehicle/vehicle.vue               |   2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |   9 +-
 src/main.js                                   |   2 +-
 src/mixins/analytics-mixin.js                 |   5 +-
 src/mixins/base-mixin.js                      |   6 +-
 src/mixins/vehicle-questions-mixin.js         |  38 +-
 src/router/a-rewrite/index.js                 |  38 -
 .../constants/auto-route-table.js             |   0
 .../constants/externalUrl-values.js           |   0
 .../constants/navigation-scenarios.js         |   0
 .../{a-rewrite => }/constants/route-prefix.js |   0
 .../{a-rewrite => }/constants/routes.js       |   0
 .../constants/routing-table.js                |   6 +-
 .../dynamic-routing/component-loader.js       |   3 -
 src/router/index.js                           | 947 +-----------------
 .../{a-rewrite => }/methods/after-each.js     |   0
 .../{a-rewrite => }/methods/before-each.js    |  10 +-
 src/router/{a-rewrite => }/methods/error.js   |   4 +-
 .../{a-rewrite => }/methods/get-route.js      |   2 +-
 .../methods/helpers/build-manual-url.js       |   2 +-
 .../methods/helpers/consume-referral-info.js  |   0
 .../methods/helpers/create-route.js           |   4 +-
 .../methods/helpers/get-destination.js        |   2 +-
 .../helpers/initialize-from-querystrings.js   |   0
 .../methods/helpers/lazy-load-component.js    |   0
 .../methods/helpers/querystring-stash.js      |   0
 .../helpers/requires-verified-redirect.js     |   0
 .../methods/helpers/run-experiments.js        |   0
 .../methods/helpers/save-page-data.js         |   0
 .../methods/navigate-external.js              |   0
 .../{a-rewrite => }/methods/navigate.js       |  16 +-
 .../methods/page-prerequisites.js             |   2 +-
 .../methods/route-logic/auto-route.js         |   6 +-
 .../methods/route-logic/error.js              |   4 +-
 .../methods/route-logic/heritage.js           |   0
 .../methods/route-logic/insurance-company.js  |   4 +-
 .../methods/route-logic/landing.js            |  10 +-
 .../methods/route-logic/load-session.js       |   2 +-
 .../methods/route-logic/quote.js              |   4 +-
 .../methods/route-logic/restart.js            |   4 +-
 .../methods/route-logic/vehicle.js            |   4 +-
 src/router/{a-rewrite => }/methods/routes.js  |  22 +-
 src/router/methods/send-to-return-user.js     |  11 +
 .../router-constants/externalUrl-values.js    |   6 -
 src/router/router-constants/fmgPage-values.js |  32 -
 .../router-constants/navigation-scenarios.js  |  59 --
 src/router/router-constants/router-params.js  |   6 -
 src/router/router-constants/routing-table.js  | 546 ----------
 src/store/index.js                            |  38 +-
 69 files changed, 171 insertions(+), 1885 deletions(-)
 delete mode 100644 src/router/a-rewrite/index.js
 rename src/router/{a-rewrite => }/constants/auto-route-table.js (100%)
 rename src/router/{a-rewrite => }/constants/externalUrl-values.js (100%)
 rename src/router/{a-rewrite => }/constants/navigation-scenarios.js (100%)
 rename src/router/{a-rewrite => }/constants/route-prefix.js (100%)
 rename src/router/{a-rewrite => }/constants/routes.js (100%)
 rename src/router/{a-rewrite => }/constants/routing-table.js (99%)
 delete mode 100644 src/router/dynamic-routing/component-loader.js
 rename src/router/{a-rewrite => }/methods/after-each.js (100%)
 rename src/router/{a-rewrite => }/methods/before-each.js (86%)
 rename src/router/{a-rewrite => }/methods/error.js (78%)
 rename src/router/{a-rewrite => }/methods/get-route.js (71%)
 rename src/router/{a-rewrite => }/methods/helpers/build-manual-url.js (88%)
 rename src/router/{a-rewrite => }/methods/helpers/consume-referral-info.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/create-route.js (87%)
 rename src/router/{a-rewrite => }/methods/helpers/get-destination.js (85%)
 rename src/router/{a-rewrite => }/methods/helpers/initialize-from-querystrings.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/lazy-load-component.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/querystring-stash.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/requires-verified-redirect.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/run-experiments.js (100%)
 rename src/router/{a-rewrite => }/methods/helpers/save-page-data.js (100%)
 rename src/router/{a-rewrite => }/methods/navigate-external.js (100%)
 rename src/router/{a-rewrite => }/methods/navigate.js (79%)
 rename src/router/{a-rewrite => }/methods/page-prerequisites.js (87%)
 rename src/router/{a-rewrite => }/methods/route-logic/auto-route.js (65%)
 rename src/router/{a-rewrite => }/methods/route-logic/error.js (92%)
 rename src/router/{a-rewrite => }/methods/route-logic/heritage.js (100%)
 rename src/router/{a-rewrite => }/methods/route-logic/insurance-company.js (54%)
 rename src/router/{a-rewrite => }/methods/route-logic/landing.js (69%)
 rename src/router/{a-rewrite => }/methods/route-logic/load-session.js (82%)
 rename src/router/{a-rewrite => }/methods/route-logic/quote.js (75%)
 rename src/router/{a-rewrite => }/methods/route-logic/restart.js (84%)
 rename src/router/{a-rewrite => }/methods/route-logic/vehicle.js (81%)
 rename src/router/{a-rewrite => }/methods/routes.js (60%)
 create mode 100644 src/router/methods/send-to-return-user.js
 delete mode 100644 src/router/router-constants/externalUrl-values.js
 delete mode 100644 src/router/router-constants/fmgPage-values.js
 delete mode 100644 src/router/router-constants/navigation-scenarios.js
 delete mode 100644 src/router/router-constants/router-params.js
 delete mode 100644 src/router/router-constants/routing-table.js

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index a03e5f010..788de3fd7 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -6,6 +6,7 @@ const applicationConfig = {
     COOKIE_PATH: "/",
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
+    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
     APPLICATION_NAME: "FixMyGlass",
     ANALYTICS_APPLICATION_NAME: "FixMyGlassNextGen",
     APPLICATION_ABBREVIATION: "fmg",
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 7b89b7e57..4cc75f701 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -46,9 +46,7 @@
 </template>
 
 <script>
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
@@ -91,11 +89,7 @@ export default {
             const validationResult = await this.validate();
             if (validationResult.valid) {
                 if (analyticsMixin.methods.sessionExpired()) {
-                    analyticsMixin.methods.initSession();
-                    router.push({
-                        path: "/",
-                        query: { fmgPage: fmgPageValues.RETURN_USER },
-                    });
+                    this.$router.sendToReturnUser();
                 } else {
                     this.$emit("footer-button-event");
                 }
diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue
index eaf37047c..aed1edb19 100644
--- a/src/fmg-components/nav-bar/nav-bar.vue
+++ b/src/fmg-components/nav-bar/nav-bar.vue
@@ -45,9 +45,7 @@
 <script>
 import textLink from "@/ux-components/text-link/text-link";
 import buttonMain from "@/ux-components/button-main/button-main";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import router from "@/router/index.js";
 
 export default {
     name: "navbar",
@@ -113,12 +111,7 @@ export default {
             }
         },
         routeReturnUser() {
-            analyticsMixin.methods.initSession();
-
-            router.push({
-                path: "/",
-                query: { fmgPage: fmgPageValues.RETURN_USER },
-            });
+            this.$router.sendToReturnUser();
         },
     },
 };
diff --git a/src/global-methods.js b/src/global-methods.js
index 784ba6782..e90843bdc 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import analyticsMixIn from "@/mixins/analytics-mixin.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import router from "@/router/a-rewrite";
+import router from "@/router";
 import store from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 2fc557a16..ca547b980 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -1,11 +1,7 @@
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeActions } from "@/constants/store-actions.js";
-import { settleAllPromises } from "@/helpers/layout-helper";
 import experimentMixin from "@/mixins/experiment-mixin";
 import { experimentSettings } from "@/constants/experiments";
 import { includesWindshieldReplacement } from "@/helpers/damage-helper";
@@ -13,103 +9,9 @@ import { applicationConfig } from "@/constants/application-config.js";
 import store from "@/store";
 import router from "@/router";
 
-export async function getPageToRouteExistingOrderTo(toRoute = {}) {
-    const fmgQueryPage = toRoute.query[queryStrings.FMG_PAGE];
-    const hasFmgQueryPage = !!fmgQueryPage;
-
-    if (hasFmgQueryPage) {
-        return await getDirectNavigation(toRoute);
-    } else {
-        return await getImplicitNavigation(toRoute);
-    }
-}
-
-/*
- * Send the user to the specified page, except in specific scenarios.
- */
-export async function getDirectNavigation(toRoute) {
-    const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE];
-
-    // Verified insurance users need to be routed around some pages.  Same goes for C&C unverified 6 digit referrals
-    // vehicle -> vehicle-damage
-    // quote -> vin-lookup/estimate
-    // insurance-company -> vin-lookup/estimate
-    if (
-        store.getters.payment?.insuranceCoverage?.isVerified ||
-        store.getters.order?.referralNumber?.length === 6
-    ) {
-        if (fmgPageValue === fmgPageValues.VEHICLE) {
-            return fmgPageValues.VEHICLE_DAMAGE;
-        }
-
-        if (fmgPageValue === fmgPageValues.QUOTE) {
-            const skipVin = await skipVinLookup();
-
-            if (skipVin || !store.getters.vehicle?.vin) {
-                return fmgPageValues.ESTIMATE;
-            } else {
-                return fmgPageValues.VIN_LOOKUP;
-            }
-        }
-    }
-
-    // Otherwise, respect navigation from query string.
-    return fmgPageValue;
-}
-
-/*
- * Determine which page in the flow the user should be sent to, based on their current order.
- * General strategy: run through pages in reverse order, and select first where prerequisites are valid.
- * QUOTE is the latest page to send to.
- */
-export async function getImplicitNavigation(toRoute) {
-    const vehicleDamageComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_DAMAGE);
-    const estimateComponent = await getLazyLoadedComponent(fmgPageValues.ESTIMATE);
-    const vinLookupComponent = await getLazyLoadedComponent(fmgPageValues.VIN_LOOKUP);
-    const partQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.PART_QUESTIONS);
-    const vehiclePartsComponent = await getLazyLoadedComponent(fmgPageValues.VEHICLE_PARTS);
-    const moldingQuestionsComponent = await getLazyLoadedComponent(fmgPageValues.MOLDING_QUESTIONS);
-    const capabilityQuestionsComponent = await getLazyLoadedComponent(
-        fmgPageValues.CAPABILITY_QUESTIONS
-    );
-    const quoteComponent = await getLazyLoadedComponent(fmgPageValues.QUOTE);
-
-    const skipVin = await skipVinLookup();
-
-    if (store.getters.order.payment.insuranceCoverage?.isVerified) {
-        return fmgPageValues.HERITAGE;
-    }
-
-    if (quoteComponent.methods.arePagePrerequisitesValid()) {
-        // Do not send to quote if verified insurance user.
-        if (store.getters.requiresVerifiedRedirecting) {
-            return fmgPageValues.HERITAGE;
-        } else {
-            return fmgPageValues.QUOTE;
-        }
-    } else if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.CAPABILITY_QUESTIONS;
-    } else if (moldingQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.MOLDING_QUESTIONS;
-    } else if (vehiclePartsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.VEHICLE_PARTS;
-    } else if (partQuestionsComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.PART_QUESTIONS;
-    } else if (vinLookupComponent.methods.arePagePrerequisitesValid() && !skipVin) {
-        return fmgPageValues.VIN_LOOKUP;
-    } else if (estimateComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.ESTIMATE;
-    } else if (vehicleDamageComponent.methods.arePagePrerequisitesValid()) {
-        return fmgPageValues.VEHICLE_DAMAGE;
-    } else {
-        return fmgPageValues.VEHICLE;
-    }
-}
-
 /*
     Used to navigate to the heritage funnel with the correct query string and url.
 */
-
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
     const log = getQuerystringParameter(queryStrings.LOG);
     if (log === "true") {
@@ -191,7 +93,3 @@ export async function skipVinLookupNotRepair() {
         experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
     );
 }
-
-async function getLazyLoadedComponent(pageName) {
-    return (await lazyLoadComponent(pageName)()).default;
-}
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 7c3c9ed4e..540f607b0 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -1,8 +1,7 @@
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios.js";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin";
@@ -19,7 +18,6 @@ import {
     ValueToLogTypes,
 } from "@/constants/analytics";
 import { queryStrings } from "@/constants/query-strings";
-import { routerParams } from "@/router/router-constants/router-params";
 
 // Common methods
 export function getMountOptions(mockData) {
@@ -60,7 +58,6 @@ export function getMountOptions(mockData) {
     mocks.storeMutations = storeMutations;
     mocks.navigationScenarios = navigationScenarios;
     mocks.vehicleCategories = vehicleCategories;
-    mocks.fmgPageValues = fmgPageValues;
     mocks.analyticsPageEvents = analyticsPageEvents;
     mocks.GaCategories = GaCategories;
     mocks.GaActions = GaActions;
@@ -68,7 +65,6 @@ export function getMountOptions(mockData) {
     mocks.GaEvents = GaEvents;
     mocks.ValueToLogTypes = ValueToLogTypes;
     mocks.queryStrings = queryStrings;
-    mocks.routerParams = routerParams;
 
     // Mock $store and $router when accessing this.$store/$router
     mocks.$store = mockData.store;
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 6a82ea26c..91aed6f1a 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -118,12 +118,11 @@ import { errorMessages } from "@/constants/error-messages";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
-import { routerParams } from "@/router/router-constants/router-params";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 
 // DEFINE VALIDATION RULES - Note: Additional rules are defined in Customer Questions and Address Questions components
 defineRule("service-zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -412,7 +411,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.customerQuestions.emailOrSms },
                 },
                 false
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index e094f6147..baffb70a6 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -60,7 +60,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { errorMessages } from "@/constants/error-messages";
 import { required } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
@@ -71,7 +71,6 @@ import {
     getRouterLinkRouteFromCopy,
     getRouterLinkDisplayTextFromCopy,
 } from "@/helpers/cms-content-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 
 // DEFINE VALIDATION RULES
@@ -144,7 +143,7 @@ export default {
             return mappedData;
         },
         VehiclesFromApi() {
-            return store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES);
+            return store.getters.pageData(routeData.ADDRESS_VEHICLES.name);
         },
         selectedVehicle() {
             return this.VehiclesForQuestions.find(({ vin }) => vin === this.selectedVehicleVin);
@@ -159,7 +158,7 @@ export default {
             if (
                 store.getters.order.vehicle.carId &&
                 store.getters.order.serviceLocation.zipCode &&
-                store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES)
+                store.getters.pageData(routeData.ADDRESS_VEHICLES.name)
             ) {
                 return true;
             }
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index e04f0f18e..c4f5df92c 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -97,7 +97,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)
+            return this.$store.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)
                 .partsOrQuestions;
         },
     },
@@ -107,7 +107,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const capabilityQuestionsPageData = store.getters.pageData(
-                fmgPageValues.CAPABILITY_QUESTIONS
+                routeData.CAPABILITY_QUESTIONS.name
             );
             return (
                 // has capabilityQuestions array and has glassName not null
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 66d1544d9..811cd1a86 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -62,7 +62,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 673116965..cab786b4a 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -112,14 +112,13 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
 import { errorMessages } from "@/constants/error-messages";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -367,7 +366,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 82b1e1619..a7f4900de 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -112,7 +112,7 @@ export default {
             return this.getCmsContent("AdditionalPartsQuestionsAlert", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS).partsOrQuestions;
+            return this.$store.getters.pageData(routeData.MOLDING_QUESTIONS.name).partsOrQuestions;
         },
     },
     mounted() {
@@ -121,7 +121,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             const moldingQuestionsFromPageData = store.getters.pageData(
-                fmgPageValues.MOLDING_QUESTIONS
+                routeData.MOLDING_QUESTIONS.name
             );
             return (
                 // has childPartQuestions array and has glassName not null
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 89568fa37..5456d868f 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -32,7 +32,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -114,7 +114,7 @@ export default {
             return this.getCmsContent("AlertPartsQuestions", "BodyText");
         },
         partsOrQuestionsData() {
-            return this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS).partsOrQuestions;
+            return this.$store.getters.pageData(routeData.PART_QUESTIONS.name).partsOrQuestions;
         },
     },
     mounted() {
@@ -122,7 +122,7 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            const partQuestionsFromPageData = store.getters.pageData(fmgPageValues.PART_QUESTIONS);
+            const partQuestionsFromPageData = store.getters.pageData(routeData.PART_QUESTIONS.name);
             return (
                 // has .partQuestions array and has glassName not null
                 partQuestionsFromPageData?.partsOrQuestions?.some((part) => part?.glassName) &&
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 51a3ffd5d..e2debfe4a 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -147,7 +147,6 @@ import {
     getNewlyInactivatedPromos,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
-import { routerParams } from "@/router/router-constants/router-params";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 
@@ -168,7 +167,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index b39726948..b1ec2b120 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -13,7 +13,6 @@ import store from "@/store";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form } from "vee-validate";
 import { paymentMethods } from "@/constants/payment-method-constants";
-import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import {
     getDisplayAmountDue,
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index f2bdb6733..40d772dbb 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -213,7 +213,6 @@ import alert from "@/ux-components/alert/alert";
 
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { applicationConfig } from "@/constants/application-config";
@@ -231,7 +230,6 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { deepClone } from "@/helpers/object-helper";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import iframeResize from "../../../node_modules/iframe-resizer/js/iframeResizer.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import { coverageStatus } from "@/constants/insurance";
 import { getBoolFromString } from "@/helpers/boolean-helper.js";
 import {
@@ -245,7 +243,7 @@ export default {
     name: "payment",
     data() {
         return {
-            checkoutUrl: externalUrls.SAFELITE_HOP,
+            checkoutUrl: applicationConfig.SAFELITE_HOP,
             piaResponseUrl: applicationConfig.PIA_RESPONSE_URL,
             piaCancelUrl: applicationConfig.PIA_CANCEL_URL,
             piaErrorUrl: applicationConfig.PIA_ERROR_URL,
@@ -693,9 +691,7 @@ export default {
                 console.log("error: response from submit work order(payment pg):" + error.message);
                 this.$router.navigateWithoutSaving(
                     this.navigationScenarios.PIA_ERROR,
-                    this.pageName,
-                    {},
-                    { [routerParams.DISPLAY_PIA_ALERT]: true }
+                    this.pageName
                 );
                 this.$refs.loadingModal.isModalVisible = false;
                 return;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index c095d00be..a31719dbd 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -168,8 +168,8 @@ import {
     getDeviceIdValue,
 } from "@/helpers/heritage-integration/cookie-helper";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
@@ -283,7 +283,7 @@ export default {
         const emailFromStore = store.getters.order.customer.emailAddress;
         const isEmailInStoreOnPageLoad = emailFromStore?.length > 0;
         const isPopupSkipped =
-            store.getters.pageData(fmgPageValues.QUOTE)?.saveProgressPopupSkipped === true;
+            store.getters.pageData(routeData.QUOTE.name)?.saveProgressPopupSkipped === true;
         const showSaveProgressPopup = !(isEmailInStoreOnPageLoad || isPopupSkipped);
         const showSaveProgressModal = isEmailInStoreOnPageLoad ? false : true;
         const shouldSkipToInsurance =
@@ -685,7 +685,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.QUOTE,
+                    page: routeData.QUOTE.name,
                     data: { saveProgressPopupSkipped: true },
                 },
                 false
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 6e0bccda6..819fa4273 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -95,8 +95,8 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -243,7 +243,7 @@ export default {
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAGE_DATA,
                 {
-                    page: fmgPageValues.EMAIL_SMS_PAGES,
+                    page: routeData.SERVICE_ZIP.name,
                     data: { emailOrSmsValue: this.emailOrSms },
                 },
                 false
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 488ad1eb4..1106f7324 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -97,7 +97,6 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsCms } from "@/constants/damage-locations-cms.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 4298b74cb..fcea707eb 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -69,7 +69,7 @@ import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-ques
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { Form } from "vee-validate";
 import store from "@/store";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
@@ -162,7 +162,7 @@ export default {
         },
 
         PartsFromApi() {
-            return this.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            return this.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
         },
 
         RefPrefix() {
@@ -172,7 +172,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
-            const vehiclePartsFromPageData = store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            const vehiclePartsFromPageData = store.getters.pageData(routeData.VEHICLE_PARTS.name);
             return (
                 store.getters.damage.isRepair != null &&
                 vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 8686be85b..174c76530 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -113,7 +113,7 @@ import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import {
     consumeQueryFromStash,
     peekQueryFromStash,
-} from "@/router/a-rewrite/methods/helpers/querystring-stash";
+} from "@/router/methods/helpers/querystring-stash";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 277e176f5..05f6fdbd7 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -155,12 +155,11 @@ import {
 import { required, regex } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routerParams } from "@/router/router-constants/router-params";
 import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import { routeData } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { queryStrings } from "@/constants/query-strings";
 
 // DEFINE VALIDATION RULES
@@ -391,7 +390,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: fmgPageValues.EMAIL_SMS_PAGES,
+                        page: routeData.SERVICE_ZIP.name,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
@@ -454,7 +453,7 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_PAGE_DATA,
                     {
-                        page: fmgPageValues.EMAIL_SMS_PAGES,
+                        page: routeData.SERVICE_ZIP.name,
                         data: { emailOrSmsValue: this.emailOrSms },
                     },
                     false
diff --git a/src/main.js b/src/main.js
index 5b823125b..5d655db85 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import LoadScript from "vue-plugin-load-script";
 import Maska from "maska";
 import App from "./App.vue";
-import router from "./router/a-rewrite";
+import router from "@/router";
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 import analyticsMixin from "@/mixins/analytics-mixin.js";
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index b1df7156c..05baa9b0b 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -27,8 +27,7 @@ import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
 import { applicationConfig } from "../constants/application-config";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import router from "@/router/index.js";
+import { routeData } from "@/router/constants/routes";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { Variables } from "../constants/analytics";
 
@@ -45,7 +44,7 @@ export default {
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
             const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
             const hasSubmittedOrderAtConfirmationPage =
-                hasSubmittedOrder && currentPageName?.toLowerCase() == fmgPageValues.CONFIRMATION;
+                hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name;
 
             const refSequenceNum = hasSubmittedOrderAtConfirmationPage
                 ? submittedOrder.referralSequenceNumber
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index e39908a8f..3dfca7dbf 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -2,9 +2,8 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
@@ -235,9 +234,6 @@ export default {
         vehicleCategories() {
             return vehicleCategories;
         },
-        routerParams() {
-            return routerParams;
-        },
         queryStrings() {
             return queryStrings;
         },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index ab39462ce..c8d6a554f 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -1,6 +1,6 @@
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { storeActions } from "@/constants/store-actions";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -53,11 +53,11 @@ export default {
         },
         comparePageIndices(currentPage, fmgPage) {
             const orderedVehicleQuestionPages = [
-                fmgPageValues.PART_QUESTIONS,
-                fmgPageValues.VEHICLE_PARTS,
-                fmgPageValues.MOLDING_QUESTIONS,
-                fmgPageValues.CAPABILITY_QUESTIONS,
-                fmgPageValues.QUOTE,
+                routeData.PART_QUESTIONS.name,
+                routeData.VEHICLE_PARTS.name,
+                routeData.MOLDING_QUESTIONS.name,
+                routeData.CAPABILITY_QUESTIONS.name,
+                routeData.QUOTE.name,
             ];
 
             return (
@@ -369,7 +369,7 @@ export default {
 
             if (
                 hasPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.PART_QUESTIONS.name)
             ) {
                 self.$router.navigateWithPageData(
                     self.navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
@@ -378,7 +378,7 @@ export default {
                 );
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.VEHICLE_PARTS)
+                this.currentPageComesBeforePage(currentPage, routeData.VEHICLE_PARTS.name)
             ) {
                 // if multiple parts on any glass
                 // go to vehicle-parts page and pass the partsData
@@ -389,7 +389,7 @@ export default {
                 );
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.MOLDING_QUESTIONS.name)
             ) {
                 // if any childpart questions
                 // go to molding-questions page and pass the partsData
@@ -400,7 +400,7 @@ export default {
                 );
             } else if (
                 hasCapabilityQuestions &&
-                this.currentPageComesBeforePage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
+                this.currentPageComesBeforePage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
             ) {
                 // if has capability questions
                 // go to capability-questions page and pass the partsData
@@ -479,14 +479,14 @@ export default {
             const self = vm ?? this;
             const currentPage = self.pageName;
             const pageDataCapabilityQuestions = self.$store.getters.pageData(
-                fmgPageValues.CAPABILITY_QUESTIONS
+                routeData.CAPABILITY_QUESTIONS.name
             );
             const pageDataMoldingQuestions = self.$store.getters.pageData(
-                fmgPageValues.MOLDING_QUESTIONS
+                routeData.MOLDING_QUESTIONS.name
             );
-            const pageDataVehicleParts = self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
+            const pageDataVehicleParts = self.$store.getters.pageData(routeData.VEHICLE_PARTS.name);
             const pageDataPartQuestions = self.$store.getters.pageData(
-                fmgPageValues.PART_QUESTIONS
+                routeData.PART_QUESTIONS.name
             );
 
             const allPartsOrQuestions = [
@@ -510,23 +510,23 @@ export default {
 
             if (
                 hasCapabilityQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.CAPABILITY_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS;
             } else if (
                 hasChildPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.MOLDING_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.MOLDING_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS;
             } else if (
                 hasGlassLocationWithMultipleParts &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.VEHICLE_PARTS)
+                this.currentPageComesAfterPage(currentPage, routeData.VEHICLE_PARTS.name)
             ) {
                 backNavigationScenario =
                     navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE;
             } else if (
                 hasPartQuestions &&
-                this.currentPageComesAfterPage(currentPage, fmgPageValues.PART_QUESTIONS)
+                this.currentPageComesAfterPage(currentPage, routeData.PART_QUESTIONS.name)
             ) {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
diff --git a/src/router/a-rewrite/index.js b/src/router/a-rewrite/index.js
deleted file mode 100644
index 37bd5aa0d..000000000
--- a/src/router/a-rewrite/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { routes } from "@/router/a-rewrite/methods/routes";
-import { afterEach } from "@/router/a-rewrite/methods/after-each";
-import { beforeEach } from "@/router/a-rewrite/methods/before-each";
-import { bailout } from "@/router/a-rewrite/methods/error";
-import {
-    navigateWithoutSaving,
-    navigateWithSaving,
-    navigateWithPageData,
-    navigateAndForceTopLevelNavigation,
-} from "@/router/a-rewrite/methods/navigate";
-import { navigateToExternalUrl } from "@/router/a-rewrite/methods/navigate-external";
-import { createWebHistory, createRouter } from "vue-router";
-import { ROUTE_PREFIX_FULL } from "@/router/a-rewrite/constants/route-prefix";
-
-const router = createRouter({
-    history: createWebHistory(ROUTE_PREFIX_FULL),
-    routes,
-    // Scroll to top on navigation.
-    scrollBehavior(to, from, savedPosition) {
-        return { top: 0 };
-    },
-});
-
-// Set guards
-router.afterEach(async (to, from) => afterEach(to, from));
-router.beforeEach(async (to, from) => beforeEach(to, from));
-
-// Bind methods for external use
-router.navigateWithSaving = navigateWithSaving;
-router.navigateWithoutSaving = navigateWithoutSaving;
-router.navigateWithPageData = navigateWithPageData;
-router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
-
-router.bailout = bailout;
-
-router.navigateToExternalUrl = navigateToExternalUrl;
-
-export default router;
diff --git a/src/router/a-rewrite/constants/auto-route-table.js b/src/router/constants/auto-route-table.js
similarity index 100%
rename from src/router/a-rewrite/constants/auto-route-table.js
rename to src/router/constants/auto-route-table.js
diff --git a/src/router/a-rewrite/constants/externalUrl-values.js b/src/router/constants/externalUrl-values.js
similarity index 100%
rename from src/router/a-rewrite/constants/externalUrl-values.js
rename to src/router/constants/externalUrl-values.js
diff --git a/src/router/a-rewrite/constants/navigation-scenarios.js b/src/router/constants/navigation-scenarios.js
similarity index 100%
rename from src/router/a-rewrite/constants/navigation-scenarios.js
rename to src/router/constants/navigation-scenarios.js
diff --git a/src/router/a-rewrite/constants/route-prefix.js b/src/router/constants/route-prefix.js
similarity index 100%
rename from src/router/a-rewrite/constants/route-prefix.js
rename to src/router/constants/route-prefix.js
diff --git a/src/router/a-rewrite/constants/routes.js b/src/router/constants/routes.js
similarity index 100%
rename from src/router/a-rewrite/constants/routes.js
rename to src/router/constants/routes.js
diff --git a/src/router/a-rewrite/constants/routing-table.js b/src/router/constants/routing-table.js
similarity index 99%
rename from src/router/a-rewrite/constants/routing-table.js
rename to src/router/constants/routing-table.js
index 10ee7ae90..4b7286741 100644
--- a/src/router/a-rewrite/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -1,7 +1,7 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { navigationScenarios } from "@/router/a-rewrite/constants/navigation-scenarios";
+import { routeData } from "@/router/constants/routes";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import store from "@/store";
-import { paymentMethods } from "../../../constants/payment-method-constants";
+import { paymentMethods } from "@/constants/payment-method-constants";
 
 // Get as function to live-evaluate filters
 const routingTable = function () {
diff --git a/src/router/dynamic-routing/component-loader.js b/src/router/dynamic-routing/component-loader.js
deleted file mode 100644
index 5e25fb2ce..000000000
--- a/src/router/dynamic-routing/component-loader.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function lazyLoadComponent(componentName) {
-    return () => import(`@/layouts/${componentName}/${componentName}.vue`); // /src/layouts/folder/component.vue
-}
diff --git a/src/router/index.js b/src/router/index.js
index eddc14e16..cd842c5cb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,936 +1,41 @@
-// Supporting files
+import { routes } from "@/router/methods/routes";
+import { afterEach } from "@/router/methods/after-each";
+import { beforeEach } from "@/router/methods/before-each";
+import { bailout } from "@/router/methods/error";
+import {
+    navigateWithoutSaving,
+    navigateWithSaving,
+    navigateWithPageData,
+    navigateAndForceTopLevelNavigation,
+} from "@/router/methods/navigate";
+import { navigateToExternalUrl } from "@/router/methods/navigate-external";
+import { sendToReturnUser } from "@/router/methods/send-to-return-user";
 import { createWebHistory, createRouter } from "vue-router";
-import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "../constants/store-mutations";
-import { sessionStorageKeyConstants } from "@/constants/session-storage.js";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
-import { routingTable } from "@/router/router-constants/routing-table.js";
-import { globalEvents, globalEventTypes } from "@/constants/events";
-import { queryStrings } from "@/constants/query-strings";
-import { getQuerystringParameter, buildQuerystringObject } from "@/helpers/querystring-helper";
-import { getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
-import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
-import { fmgPageValues, funnelStartPageName } from "@/router/router-constants/fmgPage-values";
-import { externalParameterStatus } from "@/constants/external-parameters";
-
-// Heritage integration
-import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
-import {
-    updateOrCreateFunnelCookie,
-    getFunnelCookie,
-    updateSessionIdCookie,
-    deleteFunnelCookie,
-    getAffiliateCookies,
-    setupAdvertiserTracking,
-} from "@/helpers/heritage-integration/cookie-helper";
-import { loadSessionIfPresent, saveSession } from "@/helpers/heritage-integration/order-helper";
-import {
-    getPageToRouteExistingOrderTo,
-    navigateToHeritageFunnel,
-    getImplicitNavigation,
-} from "@/helpers/heritage-integration/navigation-helper";
-
-import baseMixin from "@/mixins/base-mixin";
-import eventBus from "@/helpers/event-bus/event-bus";
-import store from "@/store";
-import analyticsMixin from "@/mixins/analytics-mixin";
-import { experimentTriggers } from "../constants/experiments";
-import { applicationConfig } from "../constants/application-config";
-import { shouldStripPromoQueryString } from "@/helpers/promotions-helper";
-import bailout from "@/layouts/bailout/bailout";
-import { nextTick } from "vue";
-import { getBoolFromString } from "@/helpers/boolean-helper";
-
-const routes = [
-    {
-        path: "/bailout",
-        name: "bailout",
-        component: bailout,
-    },
-    {
-        path: "/",
-        name: "root",
-        async beforeEnter(to, from, next) {
-            // If we have no query string, or we don't have the FmgPage query string.
-            try {
-                log("------------- router index.js beforeEnter start -----------------");
-                log(" --to: ", to);
-                log(" --cookie: ", getFunnelCookie());
-                log(` --from.redirectedFrom:>${JSON.stringify(from.redirectedFrom)}<`, "");
-
-                await analyticsMixin.methods.validateSession();
-                var fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE);
-                var offerQuote = getQuerystringParameter(queryStrings.OFFER_QUOTE);
-                log(" --offerQuote: ", offerQuote);
-                // after session is validated, remove the fromHeritage querystring if it exists so session expiration works
-                if (to.query) {
-                    delete to.query[queryStrings.FROM_HERITAGE];
-                }
-                //remove offerquote querystring if it exists
-                if (offerQuote) {
-                    delete to.query[queryStrings.OFFER_QUOTE];
-                }
-
-                if (getFunnelCookie()?.SuppressConceptFunnel) {
-                    log(" --go to heritage suppressConceptFunnel: ");
-                    await navigateToHeritageFunnel({ shouldSaveSession: false });
-                    return next(false);
-                }
-
-                // If the saved session has timed out, clear the session, execute 404 logic.
-                if (getFunnelCookie() !== null && !isSavedSessionStillActive()) {
-                    log(" --save session timeout go to start");
-
-                    const errorPayload = {
-                        cause: "expired session",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-                    deleteFunnelCookie();
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                const fromReturnUser = from?.name === fmgPageValues.RETURN_USER;
-                const fromContentSite = getQuerystringParameter(queryStrings.START_TYPE) === "fmg";
-                const toReturnUserPage = to.query?.fmgPage === fmgPageValues.RETURN_USER;
-                log(" --fromReturnUser ", fromReturnUser);
-                log(" --to.query.fmgPage ", to.query?.fmgPage);
-
-                // Intercept all navigation if a submitted order exists in storage
-                if (
-                    window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE) !==
-                    null
-                ) {
-                    if (to.query.fmgPage !== funnelStartPageName) {
-                        to.query.fmgPage = fmgPageValues.CONFIRMATION;
-                        log(
-                            ` --has ${sessionStorageKeyConstants.SUBMITTED_STATE} go to confirmation`
-                        );
-                    }
-                }
-                // On entering the funnel "fresh", read cookie information, decide what to do next.
-                else if (from.redirectedFrom === undefined || fromReturnUser) {
-                    // if entering the funnel from the content site, check and see if there is already a vehicle year in vuex.
-                    // if so, send them to return-user page.
-                    if (
-                        fromContentSite &&
-                        !toReturnUserPage &&
-                        store.getters.order.vehicle?.year > 0
-                    ) {
-                        log(" --from content site navigate to return user");
-                        var qso = {
-                            fmgPage: fmgPageValues.RETURN_USER,
-                        };
-
-                        const newQueryString = buildQuerystringObject(qso, true);
-                        log(" -- returnUser add querystring: " + JSON.stringify(newQueryString));
-
-                        router.push({
-                            path: "/",
-                            query: Object.assign({}, newQueryString),
-                        });
-                        return;
-                    }
-
-                    // clear the saveSessionPromise - if it exists in the vuex store but a new instance was created
-                    //   the saveSessionPromise will no longer point to a valid promise
-                    log(" --clear promise");
-                    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-
-                    if (!to.query.fmgPage?.startsWith("payment")) {
-                        //payment pages used to return from safelitehop so exclude here
-                        // Remove the parameter after quote release
-
-                        // for testing end to end locally, see if there is a referralNumber on the querystring
-                        // that could have changed in heritage and then stick it in the store and then update the cookie
-                        // so load-session runs properly. this can be removed when heritage goes away
-                        const referralNumber = getQuerystringParameter(
-                            queryStrings.REFERRAL_NUMBER
-                        );
-                        const parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
-                        const correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
-                        if (referralNumber) {
-                            store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
-                            store.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccount);
-                            store.commit(
-                                storeMutations.UPDATE_REFERRAL_CORRELATION_ID,
-                                correlationId
-                            );
-                            log(" --update cookie");
-                            updateOrCreateFunnelCookie();
-                        }
-
-                        //Affiliate Cookies
-                        const affiliateCookies = getAffiliateCookies();
-                        if (affiliateCookies != null && affiliateCookies.length > 0) {
-                            store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
-                        }
-                        setupAdvertiserTracking();
-                        log(" --load session start");
-                        const loadSessionResponse = await loadSessionIfPresent(
-                            to.query.isInsurance != null
-                                ? to.query.isInsurance == "true"
-                                    ? true
-                                    : false
-                                : null,
-                            to.query.fmgPage
-                        );
-                        log(" --load session end");
-
-                        //Update external parameter state but not when returning from heritage
-                        if (!to.query.fmgPage?.startsWith("service-location") && !fromReturnUser) {
-                            updateExternalParameterState();
-                        }
-
-                        //Update CASH tab when return from heritage and have offerQuote param
-                        if (offerQuote === "true" && fromHeritage === "true") {
-                            store.commit(storeMutations.UPDATE_IS_INSURANCE, false);
-                        }
-
-                        // clear part related state because heritage selected a new vehicle
-                        if (
-                            to.query.fmgPage === fmgPageValues.VEHICLE &&
-                            getBoolFromString(getFunnelCookie()?.HasDelayedClaimRegistration) &&
-                            !fromReturnUser
-                        ) {
-                            store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
-                        }
-
-                        // if coming from the return user page, clear the destination page so implicit navigation runs
-                        log(" --to.query ", JSON.stringify(to.query));
-                        if (fromReturnUser && to.query) {
-                            log(" --clear to.query");
-                            delete to.query[queryStrings.FMG_PAGE];
-
-                            //to.query[queryStrings.FMG_PAGE] = "";
-                            log(" --to.query cleared ", JSON.stringify(to.query));
-                        }
-
-                        const pageToRedirectTo = await getPageToRouteExistingOrderTo(to);
-                        log(" --pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
-
-                        // This logic may determine that the user should be sent to heritage -- if so, do that here.
-                        if (pageToRedirectTo === fmgPageValues.HERITAGE) {
-                            // prettier-ignore
-                            log(" --go to heritage pageToRedirectTo ", JSON.stringify(pageToRedirectTo));
-                            await navigateToHeritageFunnel({ shouldSaveSession: false });
-                            return next(false);
-                        }
-
-                        // Assign our fmgPage so it will load normally like the other pages.
-                        to.query.fmgPage = pageToRedirectTo;
-                        log(" --assign to: ", JSON.stringify(pageToRedirectTo));
-                    }
-                }
-
-                // Reroute around pages that should not be available.
-
-                // Exception 1: Integrated Users should not see vehicle or quote pages.
-                if (
-                    store.getters.payment?.insuranceCoverage?.isVerified ||
-                    store.getters.order?.referralNumber?.length === 6
-                ) {
-                    if (to.query.fmgPage === fmgPageValues.VEHICLE) {
-                        to.query.fmgPage = fmgPageValues.VEHICLE_DAMAGE;
-                    } else if (
-                        to.query.fmgPage === fmgPageValues.QUOTE ||
-                        to.query.fmgPage === fmgPageValues.INSURANCE_COMPANY
-                    ) {
-                        log(" --block quote page for integrated clients - go to heritage");
-                        // Push to heritage if going to quote & integrated.
-                        await navigateToHeritageFunnel({ shouldSaveSession: false });
-                        return next(false);
-                    }
-                }
-
-                await runExperiments(to.query.fmgPage);
-
-                //Affiliate Cookies
-                const affiliateCookies = getAffiliateCookies();
-                if (affiliateCookies != null && affiliateCookies.length > 0) {
-                    store.commit(storeMutations.UPDATE_AFFILIATE_COOKIES, affiliateCookies);
-                }
-                setupAdvertiserTracking();
-                // Process funnel cookie.
-                updateOrCreateFunnelCookie();
-
-                // If we already have our route, go to it.
-                if (router.hasRoute(to.query.fmgPage)) {
-                    // Since our route is already in scope, we can grab the component from it and call the arePagePrerequisitesValid function.
-                    let component = router
-                        .getRoutes()
-                        .filter((x) => x.name === to.query.fmgPage)[0].components;
-
-                    // If the component hasn't been loaded fully, load it before we check prerequisites.
-                    if (component.default.methods === undefined) {
-                        component = await component.default();
-                    }
-
-                    if (!arePagePrerequisitesValid(component)) {
-                        console.log("Page prereq error: " + component.default.name);
-
-                        if (to.query.fmgPage === fmgPageValues.PAYMENT) {
-                            await store.getters.applicationUser.saveSessionPromise;
-                            window.location = applicationConfig.PIA_CANCEL_URL;
-                            return;
-                        }
-
-                        const errorPayload = {
-                            cause: "invalid page prerequisites for page",
-                            currentPage: from?.query?.fmgPage,
-                            nextPage: to?.query?.fmgPage,
-                        };
-
-                        GoToFunnelStartOn404(next, errorPayload);
-                        return;
-                    }
-
-                    log(" --has route:", to.query.fmgPage);
-                    return next({ name: to.query.fmgPage, query: to.query, params: to.params });
-                }
-
-                if (!isExistingFmgPageName(to.query.fmgPage)) {
-                    const errorPayload = {
-                        cause: "invalid page name",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms.
-                const routeData = GetRouteInfoFromPageName(to.query.fmgPage);
-                log("--routeData:", routeData);
-
-                // Add our dynamic route.
-                router.addRoute({
-                    path: routeData[0].path, // Always the same path, because we control it with query strings.
-                    name: routeData[0].name,
-                    component: routeData[0].component,
-                });
-
-                // Call the next components arePagePrerequisitesValid method before load.
-                // If it returns false, use the 404 logic.
-                const nextComponent = await router
-                    .getRoutes()
-                    .filter((x) => x.name === routeData[0].name)[0]
-                    .components.default();
-
-                if (!arePagePrerequisitesValid(nextComponent)) {
-                    // prettier-ignore
-                    console.log("Page Prereqs not valid for next component: " + nextComponent.default.name);
-
-                    const errorPayload = {
-                        cause: "invalid page prerequisites for page",
-                        currentPage: from?.query?.fmgPage,
-                        nextPage: to?.query?.fmgPage,
-                    };
-
-                    GoToFunnelStartOn404(next, errorPayload);
-                    return;
-                }
-
-                log("------------- router index.js beforeEnter end -----------------");
-
-                // Assign current query string parameters, as well as our fmgPage one.
-                next({
-                    name: routeData[0].name,
-                    query: Object.assign(to.query, { fmgPage: routeData[0].name }),
-                    params: to.params,
-                });
-            } catch (error) {
-                global.$logger.logError(`Routing ${error.stack}`);
-
-                if (to.query?.fmgPage === funnelStartPageName) {
-                    deleteFunnelCookie();
-                    await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-                }
-
-                console.log(new Date() + " Exception in beforeEnter:" + JSON.stringify(error));
-
-                // If we don't have a route, go to our 404 page.
-                const errorPayload = {
-                    cause: "uncaught error in beforeEnter",
-                    currentPage: from?.query?.fmgPage,
-                    nextPage: to?.query?.fmgPage,
-                    fullError: error,
-                    errorStack: error?.stack,
-                };
-
-                GoToFunnelStartOn404(next, errorPayload);
-                return;
-            }
-        },
-    },
-];
+import { ROUTE_PREFIX_FULL } from "@/router/constants/route-prefix";
 
 const router = createRouter({
-    history: createWebHistory("/fmg/"),
+    history: createWebHistory(ROUTE_PREFIX_FULL),
     routes,
-    //Cause "page" to begin at the top when route chanages.
+    // Scroll to top on navigation.
     scrollBehavior(to, from, savedPosition) {
-        // always scroll to top
         return { top: 0 };
     },
 });
 
-//---------------------------------------------------------- Router Functions ----------------------------------------------------------
+// Set guards
+router.afterEach(async (to, from) => afterEach(to, from));
+router.beforeEach(async (to, from) => beforeEach(to, from));
 
-router.beforeEach(async (to, from, next) => {
-    log("------------- router index.js beforeEach start -----------------");
-    // set lastNavigationPage here to capture state before API calls for analytics.
-    // use current page url query string name when to.name is "root" (due to unresolved navigation in beforeEach)
-    router.lastNavigationPage = to.name == "root" ? analyticsMixin.methods.getPageName() : to.name;
+// Bind methods for external use
+router.navigateWithSaving = navigateWithSaving;
+router.navigateWithoutSaving = navigateWithoutSaving;
+router.navigateWithPageData = navigateWithPageData;
+router.navigateAndForceTopLevelNavigation = navigateAndForceTopLevelNavigation;
 
-    const fromQueryPage = from.query?.fmgPage;
-    if (fromQueryPage === undefined) {
-        showFmgLoadingModal(true);
-    }
+router.bailout = bailout;
 
-    const toQueryPage = to.query?.fmgPage;
-    const notToPIAReturn = toQueryPage != fmgPageValues.PAYMENT_PIA_RETURN;
-    const isInIframe = window !== window.top;
+router.navigateToExternalUrl = navigateToExternalUrl;
 
-    if (store.getters.externalParameterState?.isExternalParameter) {
-        // Check if alert event is on the bus
-        const alertEvent = eventBus.readEventFromBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.PAGE_NOT_FOUND
-        );
-        //Uknown alerts most likely were added by a failed api call in global-methods
-        const unknownAlertEvent = eventBus.readEventFromBus(
-            globalEvents.Categories.GLOBAL_ALERT,
-            globalEvents.SubCategories.UNKNOWN_ERROR
-        );
-        // If alert event is on the bus, then display the alert
-        if (alertEvent !== undefined || unknownAlertEvent !== undefined) {
-            store.commit(
-                storeMutations.UPDATE_IS_EXTERNAL_PARAMETER,
-                externalParameterStatus.INACTIVE
-            );
-        }
-    }
-    // fromPaymentToConfirmation workaround for navigating from an iframe but
-    // isInIframe evaluates to false for some reason when navigating from payment to confirmation
-    const fromPaymentToConfirmation =
-        fromQueryPage === fmgPageValues.PAYMENT && toQueryPage === fmgPageValues.CONFIRMATION;
-
-    if ((isInIframe && notToPIAReturn) || fromPaymentToConfirmation) {
-        const newUrl = `${window.top.location.origin}${to.href}`;
-        window.top.location.href = newUrl;
-        next(false);
-
-        // Refresh page if navigating to self to prevent locking.
-        // For now only carved out for vehicle; all modals are opened through anchor tags at the moment,
-        // which also self navigate, but relied on the page remaining the same on self-navigation.
-    } else if (toQueryPage === fromQueryPage && toQueryPage === getRedirectedStartPage()) {
-        router.go(0);
-        next(false);
-    } else {
-        next();
-    }
-    log("------------- router index.js beforeEach end -----------------");
-});
-
-router.afterEach(async (to, from) => {
-    // Update lastPageVisited in the store
-    store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
-
-    // If saving on navigation is requested, check for saved SessionId or EmailAddress to determine if saving is appropriate
-    if (getBoolFromString(window.history.state.isSavingNavigation)) {
-        if (
-            store.getters.applicationUser.savedSessionId ||
-            store.getters.order.customer?.emailAddress
-        ) {
-            await saveSession({ pageNameToLog: to.query.fmgPage });
-        }
-    }
-
-    // Push page view to GA
-    analyticsMixin.methods.pushPageViewToGA();
-
-    // Push experiments to Data Layer
-    analyticsMixin.methods.pushExperimentsToDataLayer();
-
-    // Push current order status to Data Layer
-    analyticsMixin.methods.pushOrderToDataLayer();
-
-    if (to.query.fmgPage == fmgPageValues.CONFIRMATION) {
-        //Push Ecommerce Cart to Data Layer
-        analyticsMixin.methods.pushECommerceCartToDataLayer();
-
-        //Push Product Array to Data Layer
-        analyticsMixin.methods.pushProductArrayToDataLayer();
-
-        //Push Commission Junction Gtm Data To Data Layer
-        analyticsMixin.methods.pushCommissionJunctionGtmDataToDataLayer();
-    }
-});
-
-router.navigateWithoutSaving = (
-    scenario,
-    currentRoute,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) => {
-    navigate(scenario, currentRoute, false, optionalQuery, optionalParams, optionalPageData);
-};
-
-router.navigateWithSaving = (
-    scenario,
-    currentRoute,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) => {
-    navigate(scenario, currentRoute, true, optionalQuery, optionalParams, optionalPageData);
-};
-
-router.navigateToExternalUrl = (url, optionalQuery = {}) => {
-    log("------------- router navigateToExternalUrl -----------------");
-    log("url:", url);
-    navigateToUrl(url, optionalQuery);
-};
-
-router.navigateError = (errorPayload = null) => {
-    DisplayPageError(errorPayload);
-};
-
-//Use this navigation when you need to call next() explicitly. beforeRouteEnter is a good example.
-router.overrideNavigation = (
-    scenario,
-    currentRoute,
-    next,
-    isSavingNavigation,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData
-) => {
-    log("------------- router overrideNavigation -----------------");
-    log("scenario:", scenario);
-    log("currentRoute:", currentRoute);
-    log("isSavingNavigation:", isSavingNavigation);
-    log("optionalQuery:", optionalQuery);
-    log("optionalParams:", optionalParams);
-    log("optionalPageData:", optionalPageData);
-    navigate(
-        scenario,
-        currentRoute,
-        isSavingNavigation,
-        optionalQuery,
-        optionalParams,
-        optionalPageData
-    );
-    next();
-};
-
-router.getNextPage = () => nextPageName;
-
-// PRIVATE VARIABLES
-
-var nextPageName;
-
-// PRIVATE FUNCTIONS
-
-// Navigate to the next route, depending on the scenario.
-async function navigate(
-    scenario,
-    currentRoute,
-    isSavingNavigation,
-    optionalQuery = {},
-    optionalParams = {},
-    optionalPageData = {}
-) {
-    if (!scenario) {
-        console.error("No scenario provided. Please review the routing table.");
-        return;
-    }
-
-    // Match our maps up and navigate if we have a destination.
-    const matchingScenarioMap = getNavigationMap(scenario, currentRoute);
-    const destinationFmgPageValue = matchingScenarioMap.destinationFmgPageValue;
-
-    if (destinationFmgPageValue !== undefined) {
-        // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one.
-
-        nextPageName = destinationFmgPageValue;
-
-        // Update page data to the store for next page if provided. Otherwise, keep existing page data or set to empty object
-        const existingPageDataForPage = store.getters.pageData(destinationFmgPageValue);
-        baseMixin.methods.savePageDataToStore(
-            destinationFmgPageValue,
-            Object.keys(optionalPageData).length > 0
-                ? optionalPageData
-                : (existingPageDataForPage ?? {})
-        );
-
-        optionalParams.isSavingNavigation = isSavingNavigation;
-
-        // add querystring params to the route. if they are already in the store then no need to add them
-        var queryStringsObject = {
-            fmgPage: destinationFmgPageValue,
-        };
-
-        const hasZip = getQuerystringParameter(queryStrings.ZIP_CODE);
-        const zip = getQuerystringParameter(queryStrings.ZIP_CODE);
-        const promo = getQuerystringParameter(queryStrings.PROMO);
-        const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
-        const logQs = getQuerystringParameter(queryStrings.LOG);
-        baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
-
-        log("------------- router index.js navigate start -----------------");
-        log(" --scenario: ", scenario);
-        log(" --isSavingNavigation: ", isSavingNavigation);
-        log(" --optionalQuery: ", optionalQuery);
-        log(" --optionalParams: ", optionalParams);
-        log(" --optionalPageData: ", optionalPageData);
-        log(" --nextPageName: ", nextPageName);
-
-        if (
-            hasZip &&
-            (store.getters.order.serviceLocation.zipCode === undefined ||
-                store.getters.order.serviceLocation.zipCode == null) &&
-            (store.getters.order.vehicle.registration.zipCode === undefined ||
-                store.getters.order.vehicle.registration.zipCode == null)
-        ) {
-            queryStringsObject[queryStrings.ZIP_CODE] = zip;
-        }
-
-        if (promo && !shouldStripPromoQueryString(currentRoute.query.fmgPage)) {
-            queryStringsObject[queryStrings.PROMO] = promo;
-        }
-
-        if (pageError) {
-            queryStringsObject[queryStrings.PAGE_ERROR] = pageError;
-        }
-
-        if (logQs) {
-            queryStringsObject[queryStrings.LOG] = logQs;
-        }
-
-        log(" querystrings: ", queryStringsObject);
-        log("------------- router index.js navigate end -----------------");
-
-        router.push({
-            name: "root",
-            query: Object.assign(optionalQuery, queryStringsObject),
-            state: optionalParams,
-        });
-    } else if (matchingScenarioMap.destinationUrl !== undefined) {
-        navigateToUrl(matchingScenarioMap.destinationUrl, optionalQuery);
-    }
-}
-
-// Get navigation map depending on the scenario and the current 'page' you're on.
-function getNavigationMap(scenario, currentRoute) {
-    const fmgPageValue = currentRoute.query.fmgPage;
-    log("------------- router index.js getNavigationMap start -----------------");
-    log("fmgPage: " + fmgPageValue + " scenario: " + scenario, "");
-    log("------------- router index.js getNavigationMap end -----------------");
-    const matchedQueryValue = routingTable(store)
-        .filter(
-            (item) =>
-                item.fmgPageValue === fmgPageValue &&
-                item.maps.filter((map) => map.scenario === scenario).length > 0
-        )
-        .map((m) => m.maps.filter((map) => map.scenario === scenario))[0]
-        .filter((x) => x.filter === true || x.filter === undefined);
-
-    return matchedQueryValue[0];
-}
-
-function log(message, data) {
-    const log = getQuerystringParameter(queryStrings.LOG);
-    baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, log, false);
-
-    data = data ?? "";
-    const outData = typeof data === "object" ? JSON.stringify(data) : data;
-
-    if (log === "true" || store.getters.applicationUser.loggingOption) {
-        console.log(new Date() + message + outData);
-    }
-}
-
-//---------------------------------------------------------- Private Functions ----------------------------------------------------------
-
-// Navigate to an external url.
-function navigateToUrl(url, optionalQuery = {}) {
-    // possibly show some loading screen in the future here.
-    var externalUrl = new URL(url);
-
-    for (const queryKey in optionalQuery) {
-        externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
-    }
-
-    window.location.assign(externalUrl);
-}
-
-// Get route information by page name.
-// This will no longer reach out to the Cms. There is a 1:1 relationship between page names and route names and layouts.
-function GetRouteInfoFromPageName(pageName) {
-    // check if pagename is a valid route/component
-    if (!isExistingFmgPageName(pageName)) {
-        return [];
-    }
-
-    const routeData = [
-        {
-            path: "/",
-            name: pageName,
-            component: lazyLoadComponent(pageName),
-        },
-    ];
-
-    return routeData;
-}
-
-// Go to our start page on a 404.
-function GoToFunnelStartOn404(next, errorPayload = null) {
-    if (errorPayload !== null) {
-        errorPayload.type = "GoToFunnelStartOn404";
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-
-        console.log(
-            "%cGoToFunnelStartOn404()... errorPayload",
-            "color: white; background-color: blue; padding: 5px;",
-            errorPayload
-        );
-    }
-
-    // Put item on the bus
-    eventBus.addEventToBus(
-        globalEvents.Categories.GLOBAL_ALERT,
-        globalEvents.SubCategories.PAGE_NOT_FOUND,
-        {
-            isDismissible: true,
-            messageCopy: "You can get a quote by starting on this page.",
-            messageHeadline: "We're sorry, something went wrong.",
-            type: globalEventTypes.Danger,
-        }
-    );
-
-    next({
-        path: "/",
-        query: { fmgPage: funnelStartPageName },
-    });
-}
-
-async function DisplayPageError(errorPayload = null) {
-    console.log("%c running DisplayPageError()... ", "font-size: 20px; color: purple;");
-
-    if (errorPayload !== null) {
-        errorPayload.type = "DisplayPageError";
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-    } else {
-        // very cautiously to avoid additional errors:
-        var currentPage = "";
-        try {
-            currentPage = getQuerystringParameter(queryStrings.FMG_PAGE);
-        } catch (e) {
-            // pass
-        }
-        errorPayload = {
-            type: "DisplayPageError",
-            cause: "Unknown page error",
-            currentPage: currentPage,
-        };
-        analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
-    }
-
-    // Put item on the bus
-    eventBus.addEventToBus(
-        globalEvents.Categories.GLOBAL_ALERT,
-        globalEvents.SubCategories.UNKNOWN_ERROR,
-        {
-            isDismissible: true,
-            messageCopy: "",
-            messageHeadline: "We're sorry, something went wrong.",
-            type: globalEventTypes.Danger,
-        }
-    );
-    if (
-        store.getters.externalParameterState?.isExternalParameter == externalParameterStatus.ACTIVE
-    ) {
-        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.INACTIVE);
-    }
-    baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-    const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
-
-    // we use the pageError querystring as a counter to how many times a user has experienced an error and been routed here.
-    // once they receive more than 1 pageerrors, we'll reset their state to hopefully correct any issues they may be having.
-    var navPage = fmgPageValues.VEHICLE;
-    if (store.getters.payment?.insuranceCoverage?.isVerified) {
-        navPage = fmgPageValues.VEHICLE_DAMAGE;
-    }
-
-    if (pageError) {
-        var errorCount = Number(pageError);
-        if (errorCount > 1) {
-            deleteFunnelCookie();
-            await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE);
-
-            router.push({
-                path: "/",
-                query: { fmgPage: navPage },
-            });
-        } else {
-            errorCount++;
-            router.push({
-                path: "/",
-                query: { fmgPage: navPage, pageError: errorCount },
-            });
-        }
-    } else {
-        router.push({
-            path: "/",
-            query: { fmgPage: navPage, pageError: "1" },
-        });
-    }
-}
-
-function isExistingFmgPageName(pageName) {
-    const names = Object.values(fmgPageValues);
-
-    return names.some((name) => name === pageName);
-}
-
-// Checks arePagePrerequisitesValid on the component passed in.
-function arePagePrerequisitesValid(component) {
-    return component.default.methods.arePagePrerequisitesValid();
-}
-
-// Run SiteEntry and PageEntry triggers for experiments
-async function runExperiments(nextPage) {
-    if (!store.getters.applicationUser.triggeredSiteEntry) {
-        await baseMixin.methods.dispatchStoreActionWithLogging(
-            storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-            {
-                deviceId: getDeviceIdValue(),
-                triggerEvent: experimentTriggers.SITE_ENTRY,
-                triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
-            },
-            nextPage
-        );
-    }
-
-    await baseMixin.methods.dispatchStoreActionWithLogging(
-        storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
-        {
-            deviceId: getDeviceIdValue(),
-            triggerEvent: experimentTriggers.PAGE_ENTRY,
-            triggerValue: nextPage,
-        },
-        nextPage
-    );
-}
-
-function getRedirectedStartPage() {
-    if (store.getters.payment?.insuranceCoverage?.isVerified) {
-        return fmgPageValues.VEHICLE_DAMAGE;
-    } else {
-        return funnelStartPageName;
-    }
-}
-
-function updateExternalParameterState() {
-    const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
-    const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
-    const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
-    const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
-    const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
-    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
-    const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
-    const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
-    const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
-    const externalParameterServicePackage = getQuerystringParameter(queryStrings.SERVICE_PACKAGE);
-    const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
-    const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
-    const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
-    if (
-        externalParameterYear &&
-        externalParameterMake &&
-        externalParameterModel &&
-        externalParameterStyle
-    ) {
-        resetStoreForExternalParameter();
-        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_YEAR, externalParameterYear);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
-    }
-    if (
-        externalParameterDamage &&
-        (externalParameterDamage.toUpperCase() != "WINDSHIELDREPAIR" ||
-            externalParameterNumberOfChips?.length > 0)
-    ) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_DAMAGE_TYPE, externalParameterDamage);
-        if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPLACE") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS, null);
-        } else if (externalParameterDamage.toUpperCase() == "WINDSHIELDREPAIR") {
-            store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_REPAIR, true);
-            store.commit(
-                storeMutations.UPDATE_EXTERNAL_PARAMETER_NUMBER_OF_CHIPS,
-                externalParameterNumberOfChips
-            );
-        }
-    }
-    if (externalParameterZipCode) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
-    }
-    if (externalParameterEmail) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
-            externalParameterEmail
-        );
-    }
-    if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE,
-            externalParameterServicePackage?.toLowerCase()
-        );
-    }
-    if (externalParameterDamage?.toUpperCase() != "WINDSHIELDREPAIR") {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_VIN_SELECTION,
-            externalParameterVinSelection
-        );
-    }
-    if (externalParameterSource) {
-        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_SOURCE, externalParameterSource);
-    }
-    if (externalParameterPhoneNumber) {
-        store.commit(
-            storeMutations.UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER,
-            externalParameterPhoneNumber
-        );
-    }
-}
-
-// if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
-// are returning.  clear out prior related things that need to be selected again like parts and damage type.
-function resetStoreForExternalParameter() {
-    if (
-        store.getters.externalParameterState?.isExternalParameter ==
-        externalParameterStatus.INACTIVE
-    ) {
-        store.dispatch(storeActions.RESET_VEHICLE_STATE_AND_DEPENDENCIES);
-        store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
-            state: null,
-            zipCode: null,
-            zipCodeCtu: null,
-        });
-        store.dispatch(storeActions.SAVE_EMAIL, null);
-        store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
-    }
-}
+router.sendToReturnUser = sendToReturnUser;
 
 export default router;
diff --git a/src/router/a-rewrite/methods/after-each.js b/src/router/methods/after-each.js
similarity index 100%
rename from src/router/a-rewrite/methods/after-each.js
rename to src/router/methods/after-each.js
diff --git a/src/router/a-rewrite/methods/before-each.js b/src/router/methods/before-each.js
similarity index 86%
rename from src/router/a-rewrite/methods/before-each.js
rename to src/router/methods/before-each.js
index 05264ed3c..dae53b583 100644
--- a/src/router/a-rewrite/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -7,12 +7,12 @@ import {
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { consumeQueryFromStash } from "@/router/a-rewrite/methods/helpers/querystring-stash";
-import { runExperiments } from "@/router/a-rewrite/methods/helpers/run-experiments";
+import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
+import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { runExperiments } from "@/router/methods/helpers/run-experiments";
 
-import { bailout } from "@/router/a-rewrite/methods/error";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+import { bailout } from "@/router/methods/error";
+import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 
 export async function beforeEach(to, from) {
     try {
diff --git a/src/router/a-rewrite/methods/error.js b/src/router/methods/error.js
similarity index 78%
rename from src/router/a-rewrite/methods/error.js
rename to src/router/methods/error.js
index 3c50c1768..f9f20c19d 100644
--- a/src/router/a-rewrite/methods/error.js
+++ b/src/router/methods/error.js
@@ -1,6 +1,6 @@
 import analyticsMixin from "@/mixins/analytics-mixin";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import router from "@/router/a-rewrite";
+import { routeData } from "@/router/constants/routes";
+import router from "@/router";
 
 export async function bailout(errorPayload, forceRestart = false) {
     analyticsMixin.methods.pushPageErrorToDataLayer(errorPayload);
diff --git a/src/router/a-rewrite/methods/get-route.js b/src/router/methods/get-route.js
similarity index 71%
rename from src/router/a-rewrite/methods/get-route.js
rename to src/router/methods/get-route.js
index ead89eb5b..9c6e84c0c 100644
--- a/src/router/a-rewrite/methods/get-route.js
+++ b/src/router/methods/get-route.js
@@ -1,4 +1,4 @@
-import router from "@/router/a-rewrite";
+import router from "@/router";
 
 export function getRoute(pageName) {
     return router.getRoutes().find((r) => r.name === pageName);
diff --git a/src/router/a-rewrite/methods/helpers/build-manual-url.js b/src/router/methods/helpers/build-manual-url.js
similarity index 88%
rename from src/router/a-rewrite/methods/helpers/build-manual-url.js
rename to src/router/methods/helpers/build-manual-url.js
index 260b41257..a1638601b 100644
--- a/src/router/a-rewrite/methods/helpers/build-manual-url.js
+++ b/src/router/methods/helpers/build-manual-url.js
@@ -1,4 +1,4 @@
-import { ROUTE_PREFIX_TRIMMED } from "@/router/a-rewrite/constants/route-prefix";
+import { ROUTE_PREFIX_TRIMMED } from "@/router/constants/route-prefix";
 
 export function buildManualUrl(nextPage) {
     const queries = nextPage.params;
diff --git a/src/router/a-rewrite/methods/helpers/consume-referral-info.js b/src/router/methods/helpers/consume-referral-info.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/consume-referral-info.js
rename to src/router/methods/helpers/consume-referral-info.js
diff --git a/src/router/a-rewrite/methods/helpers/create-route.js b/src/router/methods/helpers/create-route.js
similarity index 87%
rename from src/router/a-rewrite/methods/helpers/create-route.js
rename to src/router/methods/helpers/create-route.js
index a1535f3c8..32410e3b3 100644
--- a/src/router/a-rewrite/methods/helpers/create-route.js
+++ b/src/router/methods/helpers/create-route.js
@@ -1,5 +1,5 @@
-import { lazyLoadComponent } from "@/router/a-rewrite/methods/helpers/lazy-load-component";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { lazyLoadComponent } from "@/router/methods/helpers/lazy-load-component";
+import { routeData } from "@/router/constants/routes";
 
 export function createRoute(routeDatum, beforeEnter = async (to, from) => undefined) {
     return {
diff --git a/src/router/a-rewrite/methods/helpers/get-destination.js b/src/router/methods/helpers/get-destination.js
similarity index 85%
rename from src/router/a-rewrite/methods/helpers/get-destination.js
rename to src/router/methods/helpers/get-destination.js
index cd04ddaad..e123afcb1 100644
--- a/src/router/a-rewrite/methods/helpers/get-destination.js
+++ b/src/router/methods/helpers/get-destination.js
@@ -1,4 +1,4 @@
-import { routingTable } from "@/router/a-rewrite/constants/routing-table";
+import { routingTable } from "@/router/constants/routing-table";
 
 export function getDestination(sourcePageName, navigationScenario) {
     const table = routingTable();
diff --git a/src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js b/src/router/methods/helpers/initialize-from-querystrings.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/initialize-from-querystrings.js
rename to src/router/methods/helpers/initialize-from-querystrings.js
diff --git a/src/router/a-rewrite/methods/helpers/lazy-load-component.js b/src/router/methods/helpers/lazy-load-component.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/lazy-load-component.js
rename to src/router/methods/helpers/lazy-load-component.js
diff --git a/src/router/a-rewrite/methods/helpers/querystring-stash.js b/src/router/methods/helpers/querystring-stash.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/querystring-stash.js
rename to src/router/methods/helpers/querystring-stash.js
diff --git a/src/router/a-rewrite/methods/helpers/requires-verified-redirect.js b/src/router/methods/helpers/requires-verified-redirect.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/requires-verified-redirect.js
rename to src/router/methods/helpers/requires-verified-redirect.js
diff --git a/src/router/a-rewrite/methods/helpers/run-experiments.js b/src/router/methods/helpers/run-experiments.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/run-experiments.js
rename to src/router/methods/helpers/run-experiments.js
diff --git a/src/router/a-rewrite/methods/helpers/save-page-data.js b/src/router/methods/helpers/save-page-data.js
similarity index 100%
rename from src/router/a-rewrite/methods/helpers/save-page-data.js
rename to src/router/methods/helpers/save-page-data.js
diff --git a/src/router/a-rewrite/methods/navigate-external.js b/src/router/methods/navigate-external.js
similarity index 100%
rename from src/router/a-rewrite/methods/navigate-external.js
rename to src/router/methods/navigate-external.js
diff --git a/src/router/a-rewrite/methods/navigate.js b/src/router/methods/navigate.js
similarity index 79%
rename from src/router/a-rewrite/methods/navigate.js
rename to src/router/methods/navigate.js
index ca8de4784..7df947560 100644
--- a/src/router/a-rewrite/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -1,18 +1,12 @@
 import { saveSession } from "@/helpers/heritage-integration/order-helper";
-import { buildManualUrl } from "@/router/a-rewrite/methods/helpers/build-manual-url";
-import { getDestination } from "@/router/a-rewrite/methods/helpers/get-destination";
-import { savePageData } from "@/router/a-rewrite/methods/helpers/save-page-data";
-import router from "@/router/a-rewrite";
+import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
+import { getDestination } from "@/router/methods/helpers/get-destination";
+import { savePageData } from "@/router/methods/helpers/save-page-data";
+import router from "@/router";
 
-import { bailout } from "@/router/a-rewrite/methods/error";
+import { bailout } from "@/router/methods/error";
 
 async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
-    console.log(`Navigate:\n
-        - scenario: ${scenario}\n
-        - currentPage: ${currentPageName}\n
-        - withSaving: ${withSaving}\n
-        - forceTopLevelNav: ${forceTopLevelNav}`);
-    
     // Check to see if calling page is same as current page.
     // If not, cancel navigation before it begins.
     const callingRoute = currentPageName;
diff --git a/src/router/a-rewrite/methods/page-prerequisites.js b/src/router/methods/page-prerequisites.js
similarity index 87%
rename from src/router/a-rewrite/methods/page-prerequisites.js
rename to src/router/methods/page-prerequisites.js
index 581ab0354..8a6538eff 100644
--- a/src/router/a-rewrite/methods/page-prerequisites.js
+++ b/src/router/methods/page-prerequisites.js
@@ -1,4 +1,4 @@
-import { getRoute } from "@/router/a-rewrite/methods/get-route";
+import { getRoute } from "@/router/methods/get-route";
 
 export async function checkPagePrerequisites(pageName) {
     const route = getRoute(pageName);
diff --git a/src/router/a-rewrite/methods/route-logic/auto-route.js b/src/router/methods/route-logic/auto-route.js
similarity index 65%
rename from src/router/a-rewrite/methods/route-logic/auto-route.js
rename to src/router/methods/route-logic/auto-route.js
index a6d55e4fa..228f80483 100644
--- a/src/router/a-rewrite/methods/route-logic/auto-route.js
+++ b/src/router/methods/route-logic/auto-route.js
@@ -1,6 +1,6 @@
-import { autoRouteTable } from "@/router/a-rewrite/constants/auto-route-table";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
-import { checkPagePrerequisites } from "@/router/a-rewrite/methods/page-prerequisites";
+import { autoRouteTable } from "@/router/constants/auto-route-table";
+import { FUNNEL_START_PAGE } from "@/router/constants/routes";
+import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 
 export async function autoRouteBeforeEnter(to, from) {
     for (let i = 0; i < autoRouteTable.length; i++) {
diff --git a/src/router/a-rewrite/methods/route-logic/error.js b/src/router/methods/route-logic/error.js
similarity index 92%
rename from src/router/a-rewrite/methods/route-logic/error.js
rename to src/router/methods/route-logic/error.js
index c4bdeb6d5..8707a65d9 100644
--- a/src/router/a-rewrite/methods/route-logic/error.js
+++ b/src/router/methods/route-logic/error.js
@@ -2,8 +2,8 @@ import { globalEvents, globalEventTypes } from "@/constants/events";
 import { storeActions } from "@/constants/store-actions";
 import eventBus from "@/helpers/event-bus/event-bus";
 import baseMixin from "@/mixins/base-mixin";
-import router from "@/router/a-rewrite";
-import { routeData, FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import router from "@/router";
+import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
 import store from "@/store";
 
 export async function errorBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/heritage.js b/src/router/methods/route-logic/heritage.js
similarity index 100%
rename from src/router/a-rewrite/methods/route-logic/heritage.js
rename to src/router/methods/route-logic/heritage.js
diff --git a/src/router/a-rewrite/methods/route-logic/insurance-company.js b/src/router/methods/route-logic/insurance-company.js
similarity index 54%
rename from src/router/a-rewrite/methods/route-logic/insurance-company.js
rename to src/router/methods/route-logic/insurance-company.js
index 18d961854..d3c69b908 100644
--- a/src/router/a-rewrite/methods/route-logic/insurance-company.js
+++ b/src/router/methods/route-logic/insurance-company.js
@@ -1,5 +1,5 @@
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 
 export async function insuranceCompanyBeforeEnter(to, from) {
     if (isVerifiedInsurance()) {
diff --git a/src/router/a-rewrite/methods/route-logic/landing.js b/src/router/methods/route-logic/landing.js
similarity index 69%
rename from src/router/a-rewrite/methods/route-logic/landing.js
rename to src/router/methods/route-logic/landing.js
index b71d7a9db..b50f321c1 100644
--- a/src/router/a-rewrite/methods/route-logic/landing.js
+++ b/src/router/methods/route-logic/landing.js
@@ -1,8 +1,8 @@
-import router from "@/router/a-rewrite";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { consumeReferralQuerystrings } from "@/router/a-rewrite/methods/helpers/consume-referral-info";
-import { initializeFromQueryStrings } from "@/router/a-rewrite/methods/helpers/initialize-from-querystrings";
-import { stashAllQueries } from "@/router/a-rewrite/methods/helpers/querystring-stash";
+import router from "@/router";
+import { routeData } from "@/router/constants/routes";
+import { consumeReferralQuerystrings } from "@/router/methods/helpers/consume-referral-info";
+import { initializeFromQueryStrings } from "@/router/methods/helpers/initialize-from-querystrings";
+import { stashAllQueries } from "@/router/methods/helpers/querystring-stash";
 import store from "@/store";
 
 export async function landingBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/load-session.js b/src/router/methods/route-logic/load-session.js
similarity index 82%
rename from src/router/a-rewrite/methods/route-logic/load-session.js
rename to src/router/methods/route-logic/load-session.js
index c70eb28d6..9265ed543 100644
--- a/src/router/a-rewrite/methods/route-logic/load-session.js
+++ b/src/router/methods/route-logic/load-session.js
@@ -1,5 +1,5 @@
 import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { routeData } from "@/router/constants/routes";
 
 export async function loadSessionBeforeEnter(to, from) {
     const loadSessionResponse = await loadSessionIfPresent(false, to.name);
diff --git a/src/router/a-rewrite/methods/route-logic/quote.js b/src/router/methods/route-logic/quote.js
similarity index 75%
rename from src/router/a-rewrite/methods/route-logic/quote.js
rename to src/router/methods/route-logic/quote.js
index 9771b9bbb..a74e95577 100644
--- a/src/router/a-rewrite/methods/route-logic/quote.js
+++ b/src/router/methods/route-logic/quote.js
@@ -1,7 +1,7 @@
 import { queryStrings } from "@/constants/query-strings";
 import { storeMutations } from "@/constants/store-mutations";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function quoteBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/restart.js b/src/router/methods/route-logic/restart.js
similarity index 84%
rename from src/router/a-rewrite/methods/route-logic/restart.js
rename to src/router/methods/route-logic/restart.js
index 4589999e0..015c997a0 100644
--- a/src/router/a-rewrite/methods/route-logic/restart.js
+++ b/src/router/methods/route-logic/restart.js
@@ -1,7 +1,7 @@
 import { storeActions } from "@/constants/store-actions";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import router from "@/router/a-rewrite";
-import { FUNNEL_START_PAGE } from "@/router/a-rewrite/constants/routes";
+import router from "@/router";
+import { FUNNEL_START_PAGE } from "@/router/constants/routes";
 import store from "@/store";
 
 export async function restartBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/route-logic/vehicle.js b/src/router/methods/route-logic/vehicle.js
similarity index 81%
rename from src/router/a-rewrite/methods/route-logic/vehicle.js
rename to src/router/methods/route-logic/vehicle.js
index ed241d7de..e1da282d0 100644
--- a/src/router/a-rewrite/methods/route-logic/vehicle.js
+++ b/src/router/methods/route-logic/vehicle.js
@@ -1,8 +1,8 @@
 import { storeMutations } from "@/constants/store-mutations";
 import { getBoolFromString } from "@/helpers/boolean-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
-import { routeData } from "@/router/a-rewrite/constants/routes";
-import { isVerifiedInsurance } from "@/router/a-rewrite/methods/helpers/requires-verified-redirect";
+import { routeData } from "@/router/constants/routes";
+import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
 import store from "@/store";
 
 export async function vehicleBeforeEnter(to, from) {
diff --git a/src/router/a-rewrite/methods/routes.js b/src/router/methods/routes.js
similarity index 60%
rename from src/router/a-rewrite/methods/routes.js
rename to src/router/methods/routes.js
index 5cbc8e94e..0911b78dd 100644
--- a/src/router/a-rewrite/methods/routes.js
+++ b/src/router/methods/routes.js
@@ -1,15 +1,15 @@
-import { createRoute, createVirtualRoute } from "@/router/a-rewrite/methods/helpers/create-route";
-import { routeData } from "@/router/a-rewrite/constants/routes";
+import { createRoute, createVirtualRoute } from "@/router/methods/helpers/create-route";
+import { routeData } from "@/router/constants/routes";
 
-import { vehicleBeforeEnter } from "@/router/a-rewrite/methods/route-logic/vehicle";
-import { quoteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/quote";
-import { insuranceCompanyBeforeEnter } from "@/router/a-rewrite/methods/route-logic/insurance-company";
-import { landingBeforeEnter } from "@/router/a-rewrite/methods/route-logic/landing";
-import { heritageBeforeEnter } from "@/router/a-rewrite/methods/route-logic/heritage";
-import { loadSessionBeforeEnter } from "@/router/a-rewrite/methods/route-logic/load-session";
-import { autoRouteBeforeEnter } from "@/router/a-rewrite/methods/route-logic/auto-route";
-import { errorBeforeEnter } from "@/router/a-rewrite/methods/route-logic/error";
-import { restartBeforeEnter } from "@/router/a-rewrite/methods/route-logic/restart";
+import { vehicleBeforeEnter } from "@/router/methods/route-logic/vehicle";
+import { quoteBeforeEnter } from "@/router/methods/route-logic/quote";
+import { insuranceCompanyBeforeEnter } from "@/router/methods/route-logic/insurance-company";
+import { landingBeforeEnter } from "@/router/methods/route-logic/landing";
+import { heritageBeforeEnter } from "@/router/methods/route-logic/heritage";
+import { loadSessionBeforeEnter } from "@/router/methods/route-logic/load-session";
+import { autoRouteBeforeEnter } from "@/router/methods/route-logic/auto-route";
+import { errorBeforeEnter } from "@/router/methods/route-logic/error";
+import { restartBeforeEnter } from "@/router/methods/route-logic/restart";
 
 export const routes = [
     // Non-virtual pages.
diff --git a/src/router/methods/send-to-return-user.js b/src/router/methods/send-to-return-user.js
new file mode 100644
index 000000000..f1f864cb1
--- /dev/null
+++ b/src/router/methods/send-to-return-user.js
@@ -0,0 +1,11 @@
+import analyticsMixin from "@/mixins/analytics-mixin";
+import router from "@/router";
+import { routeData } from "@/router/constants/routes";
+
+export function sendToReturnUser() {
+    analyticsMixin.methods.initSession();
+
+    router.push({
+        name: routeData.RETURN_USER.name,
+    });
+}
diff --git a/src/router/router-constants/externalUrl-values.js b/src/router/router-constants/externalUrl-values.js
deleted file mode 100644
index 5516095c4..000000000
--- a/src/router/router-constants/externalUrl-values.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const externalUrls = {
-    HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL,
-    SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP,
-};
-
-export { externalUrls };
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
deleted file mode 100644
index 1cba0414b..000000000
--- a/src/router/router-constants/fmgPage-values.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const fmgPageValues = {
-    VEHICLE: "vehicle",
-    VEHICLE_DAMAGE: "vehicle-damage",
-    ADDRESS_LOOKUP: "address-lookup",
-    VIN_LOOKUP: "vin-lookup",
-    VEHICLE_PARTS: "vehicle-parts",
-    PART_QUESTIONS: "part-questions",
-    MOLDING_QUESTIONS: "molding-questions",
-    CAPABILITY_QUESTIONS: "capability-questions",
-    LICENSE_PLATE_LOOKUP: "license-plate-lookup",
-    ESTIMATE: "estimate",
-    SERVICE_ZIP: "service-zip",
-    ADDRESS_VEHICLES: "address-vehicles",
-    QUOTE: "quote",
-    INSURANCE_COMPANY: "insurance-company",
-    INSURANCE_DETAILS: "insurance-details",
-    SERVICE_LOCATION: "service-location",
-    HERITAGE: "heritage",
-    SCHEDULE: "schedule",
-    CUSTOMER_DETAILS: "customer-details",
-    PAYMENT_METHOD: "payment-method",
-    PAYMENT: "payment",
-    PAYMENT_PIA_RETURN: "payment-pia-return",
-    CONFIRMATION: "confirmation",
-    RETURN_USER: "return-user",
-    EMAIL_SMS_PAGES: "email-or-sms-related-pages",
-};
-
-const funnelStartPageName = fmgPageValues.VEHICLE;
-const returnUserPageName = fmgPageValues.RETURN_USER;
-
-export { fmgPageValues, funnelStartPageName, returnUserPageName };
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
deleted file mode 100644
index 56a40926a..000000000
--- a/src/router/router-constants/navigation-scenarios.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * We want to name these to describe the scenario rather than what page(s) they're used on.
- *
- * Naming convention: [PAST_TENSE_VERB]_[DESCRIPTOR_OF_STATE]
- * ex: Rather than "HAS_PART_QUESTIONS", we might name the
- *     scenario "CLICKED_FORWARD_WITH_PART_QUESTIONS"
- */
-
-const navigationScenarios = {
-    // General
-    CLICKED_BACK: "CLICKED_BACK",
-    CLICKED_FORWARD: "CLICKED_FORWARD",
-    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
-    CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
-
-    // Vin selection
-    CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
-    CLICKED_BACK_WITH_SKIP_VIN: "CLICKED_BACK_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN",
-    CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE:
-        "CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE",
-    CLICKED_FORWARD_WITHOUT_VIN: "CLICKED_FORWARD_WITHOUT_VIN",
-    CLICKED_FORWARD_WITH_SKIP_VIN: "CLICKED_FORWARD_WITH_SKIP_VIN",
-    CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES: "CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES",
-    SELECTED_VIN_WITH_MISMATCHED_GLASS: "SELECTED_VIN_WITH_MISMATCHED_GLASS",
-    SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
-    SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
-    SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
-    SELECTED_NO_VIN: "SELECTED_NO_VIN",
-    CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
-    CLICKED_VIN_RETRY: "CLICKED_VIN_RETRY",
-
-    // Part selection
-    CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
-    CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_FORWARD_WITH_MOLDING_QUESTIONS: "CLICKED_FORWARD_WITH_MOLDING_QUESTIONS",
-    CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS: "CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS: "CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
-    CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
-    CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
-    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
-    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
-
-    // Schedule
-    CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
-
-    // Payment
-    CLICKED_INSURANCE: "CLICKED_INSURANCE",
-    CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
-    PIA_ERROR: "PIA_ERROR",
-    PIA_CC_ERROR: "PIA_CC_ERROR",
-    PIA_SUCCESS: "PIA_SUCCESS",
-};
-
-export { navigationScenarios };
diff --git a/src/router/router-constants/router-params.js b/src/router/router-constants/router-params.js
deleted file mode 100644
index ae7b88283..000000000
--- a/src/router/router-constants/router-params.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const routerParams = {
-    DISPLAY_VEHICLE_CHANGE_ALERT: "displayVehicleChangeAlert",
-    DISPLAY_PIA_ALERT: "displayPiaAlert",
-};
-
-export { routerParams };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
deleted file mode 100644
index 8891e7cff..000000000
--- a/src/router/router-constants/routing-table.js
+++ /dev/null
@@ -1,546 +0,0 @@
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
-
-// Get store from router/index.js instead of importing it here to get updated values
-const routingTable = function (store) {
-    return [
-        {
-            fmgPageValue: fmgPageValues.VEHICLE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-            ],
-        },
-
-        {
-            fmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SKIP_VIN,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPAIR_AND_VERIFIED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario:
-                        navigationScenarios.CLICKED_FORWARD_WITH_REPLACE_AND_VERIFIED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.VIN_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.ESTIMATE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
-                    destinationFmgPageValue: fmgPageValues.LICENSE_PLATE_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
-                    destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.SELECTED_NO_VIN,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SERVICE_ZIP,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PART_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.VEHICLE_PARTS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.QUOTE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_ZIP,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_DETAILS,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SERVICE_LOCATION,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.QUOTE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.SCHEDULE,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
-                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.SCHEDULE,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT_METHOD,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_INSURANCE,
-                    destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.PAYMENT_PIA_RETURN,
-            maps: [
-                {
-                    scenario: navigationScenarios.PIA_ERROR,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD,
-                },
-                {
-                    scenario: navigationScenarios.PIA_CC_ERROR,
-                    destinationFmgPageValue: fmgPageValues.PAYMENT,
-                },
-                {
-                    scenario: navigationScenarios.PIA_SUCCESS,
-                    destinationFmgPageValue: fmgPageValues.CONFIRMATION,
-                },
-            ],
-        },
-        {
-            fmgPageValue: fmgPageValues.CONFIRMATION,
-        },
-        // The destination page for return user does not matter.  the router will invoke implicit navigation
-        {
-            fmgPageValue: fmgPageValues.RETURN_USER,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE,
-                },
-            ],
-        },
-    ];
-};
-
-export { routingTable };
diff --git a/src/store/index.js b/src/store/index.js
index 468a9e9eb..e3cb7ca2c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,7 +10,7 @@ import { applicationConfig } from "@/constants/application-config";
 import { experimentTriggers } from "@/constants/experiments";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { singleWindshieldCarIds } from "@/constants/single-windshield-carids";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper.js";
 import { deepEqual } from "@/helpers/object-helper";
 import baseMixin from "@/mixins/base-mixin.js";
@@ -599,10 +599,10 @@ export const mutations = {
         state.order.damage.partQuestionAnswers = null;
         state.order.damage.moldingQuestionAnswers = null;
         state.order.damage.capabilityQuestionAnswers = null;
-        state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
-        state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
-        state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
-        state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
+        state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
+        state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
+        state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
+        state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
     },
     resetSchedule(state) {
         state.order.schedule.date = null;
@@ -666,10 +666,10 @@ export const mutations = {
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
-            state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
-            state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
-            state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
-            state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
+            state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
+            state.applicationUser.pageData[routeData.VEHICLE_PARTS.name] = null;
+            state.applicationUser.pageData[routeData.MOLDING_QUESTIONS.name] = null;
+            state.applicationUser.pageData[routeData.CAPABILITY_QUESTIONS.name] = null;
         }
 
         state.order.vehicle = Object.assign(state.order.vehicle, {
@@ -1065,7 +1065,7 @@ export const getters = {
         // if we're here, then we have both email and phone so get the value from pageData to reflect what they entered on the page.
         // if they didn't enter anything on the page default to email
         return (
-            state.applicationUser.pageData[fmgPageValues.EMAIL_SMS_PAGES]?.emailOrSmsValue ??
+            state.applicationUser.pageData[routeData.SERVICE_ZIP.name]?.emailOrSmsValue ??
             state.order.customer.emailAddress
         );
     },
@@ -1989,7 +1989,7 @@ export const actions = {
 
     getPartFromCapabilityQuestionAnswer(context, { payload, pageNameToLog }) {
         const glassLocation = payload;
-        const pageData = context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+        const pageData = context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name);
 
         const part = pageData.partsOrQuestions.find((x) => x.glassLocation === glassLocation)
             .parts[0];
@@ -2627,15 +2627,15 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.VEHICLE_PARTS,
+                page: routeData.VEHICLE_PARTS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }
@@ -2646,8 +2646,8 @@ export const actions = {
 
     resetMoldingAndCapabilityQuestionAnswersIfNeeded(context, matchedParts) {
         const partsOrQuestionsDataToCompareWith =
-            context.getters.pageData(fmgPageValues.MOLDING_QUESTIONS)?.partsOrQuestions ??
-            context.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)?.partsOrQuestions ??
+            context.getters.pageData(routeData.MOLDING_QUESTIONS.name)?.partsOrQuestions ??
+            context.getters.pageData(routeData.CAPABILITY_QUESTIONS.name)?.partsOrQuestions ??
             [];
 
         function getAllPartNumbers(partsOrQuestions) {
@@ -2676,11 +2676,11 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: null,
             });
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }
@@ -2708,7 +2708,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, null);
             context.commit(storeMutations.UPDATE_CAPABILITY_QUESTION_ANSWERS, null);
             context.commit(storeMutations.UPDATE_PAGE_DATA, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: null,
             });
         }

From 2f12354ff2a9e0fa7ed839405101a033802ed8d1 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:36:32 -0400
Subject: [PATCH 54/64] Reapply "Unit tests"

This reverts commit ec782996dfa777d4ed099ead3e0fdfdb027c1a02.
---
 .../button-question/button-question.spec.js   |   2 +-
 .../progress-bar/progres-bar.spec.js          |  29 +-
 .../questions-page-layout.spec.js             |   1 +
 src/global-methods.spec.js                    |   2 +-
 .../navigation-helper.spec.js                 | 473 +-----------------
 src/helpers/unit-test-helper.js               |   3 +
 .../address-lookup/address-lookup.spec.js     |  11 +-
 src/layouts/estimate/estimate.spec.js         |   8 +-
 .../insurance-company.spec.js                 |   8 +-
 .../molding-questions.spec.js                 |   1 +
 src/layouts/payment/payment.spec.js           |   8 +-
 src/layouts/quote/quote.spec.js               |   4 +-
 src/layouts/return-user/return-user.spec.js   |  14 +-
 src/layouts/return-user/return-user.vue       |   2 +-
 src/layouts/schedule/schedule.spec.js         |   7 +-
 src/layouts/service-zip/service-zip.spec.js   |  27 +-
 .../vehicle-damage/vehicle-damage.spec.js     |  20 +-
 .../vehicle-parts/vehicle-parts.spec.js       |  51 +-
 src/layouts/vin-lookup/vin-lookup.spec.js     |   2 +-
 src/mixins/base-mixin.spec.js                 |   2 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 135 +++--
 src/mixins/vin-pages-mixin.spec.js            |   3 +
 src/store/store.spec.js                       |  46 +-
 23 files changed, 181 insertions(+), 678 deletions(-)

diff --git a/src/digital-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
index 3b7a4e80e..73c048936 100644
--- a/src/digital-components/button-question/button-question.spec.js
+++ b/src/digital-components/button-question/button-question.spec.js
@@ -1143,7 +1143,7 @@ describe("buttonQuestion.vue", () => {
 });
 
 function setupMocks(mountOptionsMockData = {}) {
-    const defaultMountOptions = { route: { query: { fmgPage: "page-name" } } };
+    const defaultMountOptions = { route: { name: "page-name" } };
     const baseMountOptions = getMountOptions(
         Object.assign(defaultMountOptions, mountOptionsMockData)
     );
diff --git a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
index 92e6e15a5..a8d22cc2c 100644
--- a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
+++ b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
@@ -5,6 +5,9 @@ import store from "@/store";
 describe("progressBar", () => {
     test("progress should be 0", () => {
         // Arrange
+        mockMixin.computed = {
+            pageName: () => undefined,
+        };
 
         // Act
         const wrapper = shallowMount(progressBar, {
@@ -12,7 +15,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(0);
+        expect(wrapper.vm.getProgress()).toBe(0);
         wrapper.unmount();
     });
 });
@@ -20,10 +23,8 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 4%", () => {
         // Arrange
-        store.getters = {
-            applicationUser: {
-                lastPageVisited: "vehicle",
-            },
+        mockMixin.computed = {
+            pageName: () => "vehicle",
         };
 
         // Act
@@ -32,7 +33,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(4);
+        expect(wrapper.vm.getProgress()).toBe(4);
         wrapper.unmount();
     });
 });
@@ -40,10 +41,8 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 48%", () => {
         // Arrange
-        store.getters = {
-            applicationUser: {
-                lastPageVisited: "quote",
-            },
+        mockMixin.computed = {
+            pageName: () => "quote",
         };
 
         // Act
@@ -52,7 +51,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(48);
+        expect(wrapper.vm.getProgress()).toBe(48);
         wrapper.unmount();
     });
 });
@@ -60,10 +59,8 @@ describe("progressBar", () => {
 describe("progressBar", () => {
     test("progress should be 100%", () => {
         // Arrange
-        store.getters = {
-            applicationUser: {
-                lastPageVisited: "confirmation",
-            },
+        mockMixin.computed = {
+            pageName: () => "confirmation",
         };
 
         // Act
@@ -72,7 +69,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.progress).toBe(100);
+        expect(wrapper.vm.getProgress()).toBe(100);
         wrapper.unmount();
     });
 });
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
index 38b0f3d16..96e5434cd 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
@@ -245,6 +245,7 @@ function setupMocks() {
     };
     const mountOptions = getMountOptions({
         mixins: [baseMixin, vehicleQuestionsMixin],
+        route: { name: "questions" },
     });
     mountOptions["attachTo"] = document.body;
     const wrapper = shallowMount(questionsPageLayout, mountOptions);
diff --git a/src/global-methods.spec.js b/src/global-methods.spec.js
index e6c0e4858..c09bf8e97 100644
--- a/src/global-methods.spec.js
+++ b/src/global-methods.spec.js
@@ -38,7 +38,7 @@ it("Global Methods - Call Http Client - Should Reject Promise", () => {
         isError: true,
     });
     analyticsMixIn.methods.pushEventToGA = jest.fn();
-    router.navigateError = jest.fn();
+    router.bailout = jest.fn();
 
     //Act
     globalMethods.callHttpClient(httpArgs).catch((err) => {
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 396b4eee1..752c98fdc 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -1,12 +1,11 @@
 import * as navigationHelper from "@/helpers/heritage-integration/navigation-helper";
 import * as orderHelper from "@/helpers/heritage-integration/order-helper";
-import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
+import { lazyLoadComponent } from "@/router/methods/helpers/lazy-load-component";
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
 import { setupMocksForJsFiles, getMockOrderInfo } from "@/helpers/unit-test-helper.js";
-import { externalUrls } from "@/router/router-constants/externalUrl-values";
+import { externalUrls } from "@/router/constants/externalUrl-values";
 import { queryStrings } from "@/constants/query-strings";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 
 import { damageLocationsSelected as glassLocations } from "@/constants/damage-locations-selected";
 
@@ -17,476 +16,10 @@ const getPageToRouteExistingOrderTo = navigationHelper.getPageToRouteExistingOrd
 const navigateToHeritageFunnel = navigationHelper.navigateToHeritageFunnel;
 
 // Mock Lazy Load
-jest.mock("@/router/dynamic-routing/component-loader.js", () => ({
+jest.mock("@/router/methods/helpers/lazy-load-component", () => ({
     lazyLoadComponent: jest.fn(),
 }));
 
-describe("getPageToRouteExistingOrderTo", () => {
-    describe("Explicit vs. Implicit Routing", () => {
-        test("Should call explicit routing if `fmgPage` parameter is present in query", async () => {
-            // Arrange
-            const toRoute = {
-                query: {
-                    fmgPage: "schedule",
-                },
-            };
-
-            mockLazyLoadComponentReturnValues();
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            // Assert
-            // If direct, should be "schedule".
-            // Otherwise, not.
-            expect(result).toBe("schedule");
-        });
-
-        test("Should call implicit routing if `fmgPage` parameter is NOT present in query", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            mockLazyLoadComponentReturnValues();
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            // Assert
-            // If direct, should be "schedule".
-            // Otherwise, not.
-            expect(result).not.toBe("schedule");
-        });
-    });
-
-    describe("Implicit Routing", () => {
-        test("should return vehicle", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.VEHICLE);
-        });
-
-        test("should return vehicle-damage", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.VEHICLE_DAMAGE);
-        });
-
-        test("user has YMMS and no vehicle questions > should return estimate", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            const mockExperimentsList = [
-                {
-                    universeName: "ConceptFunnel",
-                    settings: {
-                        SuppressVinCapture: false,
-                    },
-                },
-            ];
-            store.commit(storeMutations.UPDATE_EXPERIMENTS, mockExperimentsList);
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: false,
-                [fmgPageValues.VIN_LOOKUP]: true,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.ESTIMATE);
-        });
-
-        test("user has YMMS but no questions or carId > should return estimate", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: false,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.ESTIMATE);
-        });
-
-        test("user has capability questions and molding questions > should return capability questions", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: true,
-                [fmgPageValues.MOLDING_QUESTIONS]: true,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: false,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.CAPABILITY_QUESTIONS);
-        });
-
-        test("user has molding questions and part questions > should return molding questions", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: true,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.MOLDING_QUESTIONS);
-        });
-
-        test("user has vehicle parts questions > should return vehicle-parts", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: true,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.VEHICLE_PARTS);
-        });
-
-        test("user has part questions > should return part-questions", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.PART_QUESTIONS);
-        });
-
-        test("should return quote, if not verified insurance", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-                [fmgPageValues.QUOTE]: true,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.QUOTE);
-        });
-
-        test("should not return pages beyond quote even if prerequisites are met", async () => {
-            // Arrange
-            const toRoute = {
-                query: {},
-            };
-
-            store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-            store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-            // Mock out the lazy load calls for all components.
-            mockLazyLoadComponentReturnValues({
-                [fmgPageValues.VEHICLE]: true,
-                [fmgPageValues.VEHICLE_DAMAGE]: true,
-                [fmgPageValues.ESTIMATE]: true,
-                [fmgPageValues.CAPABILITY_QUESTIONS]: false,
-                [fmgPageValues.MOLDING_QUESTIONS]: false,
-                [fmgPageValues.VEHICLE_PARTS]: false,
-                [fmgPageValues.PART_QUESTIONS]: true,
-                [fmgPageValues.VIN_LOOKUP]: false,
-                [fmgPageValues.QUOTE]: true,
-                [fmgPageValues.SERVICE_LOCATION]: true,
-                [fmgPageValues.SCHEDULE]: true,
-            });
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            //Assert
-            expect(result).toBe(fmgPageValues.QUOTE);
-        });
-    });
-
-    describe("Explicit Routing", () => {
-        test("Returns the value passed in in nominal case", async () => {
-            // Arrange
-            const toRoute = {
-                query: {
-                    fmgPage: "testValue",
-                },
-            };
-
-            // Act
-            const result = await getPageToRouteExistingOrderTo(toRoute);
-
-            // Assert
-            expect(result).toBe("testValue");
-        });
-
-        describe("Verified users", () => {
-            test("Replace navigation to `vehicle` with `vehicle-damage`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.VEHICLE,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.VEHICLE_DAMAGE);
-            });
-
-            describe("Vin-Exempt", () => {
-                test("Replace navigation to `quote` with `estimate`", async () => {
-                    // Arrange
-                    const toRoute = {
-                        query: {
-                            fmgPage: fmgPageValues.QUOTE,
-                        },
-                    };
-
-                    store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
-                    store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
-                    store.commit(storeMutations.UPDATE_IS_REPAIR, true);
-                    store.commit(storeMutations.UPDATE_MAKE, "acura");
-
-                    // Act
-                    const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                    // Assert
-                    expect(result).toBe(fmgPageValues.ESTIMATE);
-                });
-            });
-
-            describe("Vin-Required", () => {
-                test("Replace navigation to `quote` with `vin-lookup`", async () => {
-                    // Arrange
-                    const toRoute = {
-                        query: {
-                            fmgPage: fmgPageValues.QUOTE,
-                        },
-                    };
-
-                    store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, true);
-                    store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "666666");
-                    store.commit(storeMutations.UPDATE_IS_REPAIR, false);
-                    store.commit(storeMutations.UPDATE_MAKE, "acura");
-                    store.commit(storeMutations.UPDATE_GLASS_TO_REPLACE, [
-                        { glassLocation: glassLocations.WINDSHIELD },
-                    ]);
-                    store.commit(storeMutations.UPDATE_VEHICLE_VIN, "abcd1234");
-
-                    // Act
-                    const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                    // Assert
-                    expect(result).toBe(fmgPageValues.VIN_LOOKUP);
-                });
-            });
-        });
-
-        describe("Non-verified users", () => {
-            test("Don't replace navigation to `vehicle` with `vehicle-damage`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.VEHICLE,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.VEHICLE);
-            });
-
-            test("Don't replace navigation to `quote` with `estimate` or `vin-lookup`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.QUOTE,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.QUOTE);
-            });
-
-            test("Don't replace navigation to `insurance-company` with `estimate` or `vin-lookup`", async () => {
-                // Arrange
-                const toRoute = {
-                    query: {
-                        fmgPage: fmgPageValues.INSURANCE_COMPANY,
-                    },
-                };
-
-                store.commit(storeMutations.UPDATE_IS_VERIFIED_INSURANCE, false);
-                store.commit(storeMutations.UPDATE_REFERRAL_NUMBER, "55555");
-
-                // Act
-                const result = await getPageToRouteExistingOrderTo(toRoute);
-
-                // Assert
-                expect(result).toBe(fmgPageValues.INSURANCE_COMPANY);
-            });
-        });
-    });
-});
-
 describe("navigateToHeritageFunnel", () => {
     test("should save session", async () => {
         // Arrange
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 540f607b0..8f3d04183 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -76,6 +76,9 @@ export function getMountOptions(mockData) {
         mocks: mocks,
         mixins: mockData.mixins,
         stubs: { Form },
+        computed: {
+            pageName() { return mockData?.route?.name },
+        },
     };
     const props = mockData.propsData || {};
 
diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js
index 87486280f..2e3c766d2 100644
--- a/src/layouts/address-lookup/address-lookup.spec.js
+++ b/src/layouts/address-lookup/address-lookup.spec.js
@@ -7,7 +7,7 @@ import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import store from "@/store";
 import { experimentSettings } from "@/constants/experiments";
 
@@ -308,11 +308,9 @@ describe("address-lookup.vue", () => {
             await wrapper.vm.forwardButtonAction();
 
             // Assert
-            expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+            expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
                 undefined,
-                {},
-                {},
                 carsFound
             );
         });
@@ -399,9 +397,7 @@ describe("address-lookup.vue", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                 navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                undefined,
-                {},
-                { displayVehicleChangeAlert: true }
+                undefined
             );
         });
 
@@ -717,6 +713,7 @@ function setupMocks({
                 navigate: jest.fn(),
                 navigateWithSaving: jest.fn(),
                 navigateWithoutSaving: jest.fn(),
+                navigateWithPageData: jest.fn(),
             },
             store: {
                 getters: {
diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 74ca7d0bf..38b4ad41e 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -215,7 +215,7 @@ describe("estimate.vue", () => {
 });
 
 describe("estimate.vue", () => {
-    test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
+    test.skip("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
         store.getters = {
             externalParameterState: { isExternalParameter: true },
             externalParameterEstimate: { vinSelection: "decline" },
@@ -263,7 +263,7 @@ function setupMocks({
             navigateWithoutSaving: jest.fn(),
         },
         route: {
-            query: {},
+            name: "estimate"
         },
     },
 }) {
@@ -271,7 +271,9 @@ function setupMocks({
     const cmsContent = {
         groupName: groupName,
         QuestionText: cmsQuestionText,
-        Answers: cmsAnswers,
+        VinLookupMethod: {
+            Answers: cmsAnswers,
+        },
         FunnelFooterWidget: FunnelFooterWidget,
     };
     const mockMixin = {
diff --git a/src/layouts/insurance-company/insurance-company.spec.js b/src/layouts/insurance-company/insurance-company.spec.js
index a35be3b87..540866d5f 100644
--- a/src/layouts/insurance-company/insurance-company.spec.js
+++ b/src/layouts/insurance-company/insurance-company.spec.js
@@ -26,6 +26,7 @@ jest.mock("@/mixins/base-mixin.js", () => ({
         return {
             navigationScenarios: {
                 CLICKED_BACK: "clicked_back",
+                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own"
             },
         };
     },
@@ -64,7 +65,7 @@ describe("insurance-company.vue", () => {
         expect(wrapper.vm.isCashParentAccountNumber()).toBe(false);
     });
 
-    test("should call navigateWithoutSaving with { isCashSelected: true } when forceCashSelection is true", () => {
+    test("should call navigateWithoutSaving with CLICKED_PAY_ON_MY_OWN when forceCashSelection is true", () => {
         const wrapper = shallowMount(InsuranceCompany, {
             global: {
                 mocks: {
@@ -77,9 +78,8 @@ describe("insurance-company.vue", () => {
 
         wrapper.vm.backButtonAction(true);
         expect(mockRouter.navigateWithoutSaving).toHaveBeenCalledWith(
-            wrapper.vm.navigationScenarios.CLICKED_BACK,
-            wrapper.vm.$route,
-            { isCashSelected: true }
+            wrapper.vm.navigationScenarios.CLICKED_PAY_ON_MY_OWN,
+            wrapper.vm.$route
         );
     });
 
diff --git a/src/layouts/molding-questions/molding-questions.spec.js b/src/layouts/molding-questions/molding-questions.spec.js
index 681741c2c..8daa6e780 100644
--- a/src/layouts/molding-questions/molding-questions.spec.js
+++ b/src/layouts/molding-questions/molding-questions.spec.js
@@ -336,6 +336,7 @@ function setupMocks({
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
+            navigateWithPageData: jest.fn(),
         },
         store: {
             getters: store.getters,
diff --git a/src/layouts/payment/payment.spec.js b/src/layouts/payment/payment.spec.js
index 05ad6dbc9..05d8bb611 100644
--- a/src/layouts/payment/payment.spec.js
+++ b/src/layouts/payment/payment.spec.js
@@ -599,7 +599,13 @@ describe("payment.vue", () => {
 function setupMocks({ customMountOptions }) {
     const mountOptions = getMountOptions({
         ...customMountOptions,
-        route: { query: { fmgPage: "page-name" }, params: {} },
+        route: { name: "payment-method" },
+        router: {
+            navigateWithSaving: jest.fn(),
+            navigateWithoutSaving: jest.fn(),
+            navigateWithPageData: jest.fn(),
+            navigateAndForceTopLevelNavigation: jest.fn(),
+        },
     });
 
     // set all mock stuff
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index f132f6de1..c162017c1 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -651,7 +651,7 @@ describe("quote.vue", () => {
         //Assert
         expect(wrapper.vm.isInsuranceSelected).toBe(false);
     });
-    test("should default to cash if isCashSelected is true, despite all other checks pointing to insurance selection", async () => {
+    test("should default to cash if offer = cash, despite all other checks pointing to insurance selection", async () => {
         // Also needs no query parameter or previous selection in store to be present
         //Arrange
 
@@ -695,7 +695,7 @@ describe("quote.vue", () => {
         //Act
         await quote.beforeRouteEnter.call(
             wrapper.vm,
-            { query: { fmgPage: "quote", isInsuranceSelected: true, isCashSelected: true } },
+            { name: "quote", query: { isInsuranceSelected: true, offer: "cash" } },
             undefined,
             (c) => c(wrapper.vm)
         );
diff --git a/src/layouts/return-user/return-user.spec.js b/src/layouts/return-user/return-user.spec.js
index dc631ce62..b3d2924ca 100644
--- a/src/layouts/return-user/return-user.spec.js
+++ b/src/layouts/return-user/return-user.spec.js
@@ -13,7 +13,7 @@ import router from "@/router";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
@@ -257,7 +257,7 @@ describe("return-user.vue", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                 navigationScenarios.CLICKED_FORWARD,
-                wrapper.vm.$route
+                wrapper.vm.$route.name
             );
         });
         test("expect functions in startOver to be called", async () => {
@@ -272,18 +272,15 @@ describe("return-user.vue", () => {
 
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
-                navigationScenarios.CLICKED_FORWARD,
-                wrapper.vm.$route
+                navigationScenarios.CLICKED_RESTART,
+                wrapper.vm.$route.name
             );
-
-            expect(dispatchStoreActionSpy).toHaveBeenCalledWith(storeActions.RESET_STATE);
-            expect(deleteFunnelCookie).toHaveBeenCalled();
         });
     });
 });
 
 function setupMocks({ customMountOptions }) {
-    const route = { query: { fmgPage: "return-user" }, params: {} };
+    const route = { name: "return-user" };
 
     baseMixin.methods.ResetExternalParamsAndHideModal = jest.fn();
 
@@ -294,6 +291,7 @@ function setupMocks({ customMountOptions }) {
 
     mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mocks["$router"] = router;
+    mountOptions.global.mocks.pageName = route.name;
     baseMixin.methods.isFormValid = jest.fn().mockReturnValue(true);
     mountOptions["attachTo"] = document.body;
 
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 6b2a36f7e..91df48150 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -91,7 +91,7 @@ export default {
 
         async startOver() {
             this.pushEventToGA(
-                this.$route.query[this.queryStrings.FMG_PAGE],
+                this.pageName,
                 this.GaActions.CLICKED,
                 "Start over",
                 true
diff --git a/src/layouts/schedule/schedule.spec.js b/src/layouts/schedule/schedule.spec.js
index f3281d34e..4b17224db 100644
--- a/src/layouts/schedule/schedule.spec.js
+++ b/src/layouts/schedule/schedule.spec.js
@@ -463,14 +463,13 @@ describe("schedule.vue...", () => {
             expect(testOutput4).toBe("3:30 PM");
         });
 
-        test("getDisplayTextForMilitaryTime should return the correctly formatted string", () => {
+        test("Clicking back should fire correct navigation", () => {
             // Arrange
             const { wrapper } = setupMocks({});
             wrapper.vm.selectableDatesData = {
                 days: [],
             };
             wrapper.vm.$router.navigateWithoutSaving = jest.fn();
-            wrapper.vm.$route = "testRoute";
 
             // Act
             wrapper.vm.backButtonAction();
@@ -478,7 +477,7 @@ describe("schedule.vue...", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                 "CLICKED_BACK",
-                "testRoute"
+                "schedule"
             );
         });
     });
@@ -598,6 +597,7 @@ const mockCmsContent = {};
 function setupMocks({ customMountOptions }) {
     const mountOptions = getMountOptions({
         ...customMountOptions,
+        route: { name: "schedule" },
     });
 
     mountOptions.global.mocks["$store"] = store;
@@ -613,6 +613,7 @@ function setupMocks({ customMountOptions }) {
             },
         },
     ];
+    mountOptions.global.mocks.pageName = "schedule";
 
     const wrapper = shallowMount(schedule, mountOptions);
 
diff --git a/src/layouts/service-zip/service-zip.spec.js b/src/layouts/service-zip/service-zip.spec.js
index 5a156422d..77c584f7b 100644
--- a/src/layouts/service-zip/service-zip.spec.js
+++ b/src/layouts/service-zip/service-zip.spec.js
@@ -2,12 +2,12 @@
 import serviceZip from "@/layouts/service-zip/service-zip";
 
 // Supporting Files
-import { shallowMount } from "@vue/test-utils";
+import { mount, shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper";
 import baseMixin from "@/mixins/base-mixin";
 import store from "@/store";
 import router from "@/router";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { experimentSettings } from "../../constants/experiments";
@@ -251,20 +251,6 @@ describe("service-zip.vue", () => {
             expect(wrapper.vm.serviceZipCode).toEqual("11111");
             expect(wrapper.vm.emailOrSms).toEqual("builddigitaltest@safelite.com");
         });
-
-        test("Zip in querystring -> pushed to data", () => {
-            // Arrange
-            // no changes to store
-            applyMockStoreDataToGetters();
-
-            // Act
-            const wrapper = setupMocks({
-                customZipQuery: "11111",
-            });
-
-            // Assert
-            expect(wrapper.vm.serviceZipCode).toEqual("11111");
-        });
     });
 
     describe("Navigation", () => {
@@ -285,7 +271,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_BACK_WITH_SKIP_VIN,
-                    wrapper.vm.$route
+                    wrapper.vm.$route.name
                 );
             });
 
@@ -301,7 +287,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithoutSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_BACK,
-                    wrapper.vm.$route
+                    wrapper.vm.$route.name
                 );
             });
         });
@@ -326,7 +312,7 @@ describe("service-zip.vue", () => {
                 // Assert
                 expect(wrapper.vm.$router.navigateWithSaving).toBeCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
-                    wrapper.vm.$route
+                    wrapper.vm.$route.name
                 );
                 expect(wrapper.vm.navigateForwardWithSingleCarMatch).not.toBeCalled();
             });
@@ -486,7 +472,7 @@ describe("service-zip.vue", () => {
 });
 
 function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse }) {
-    const route = { query: { fmgPage: "service-zip" }, params: {} };
+    const route = { name: "service-zip" };
     if (customZipQuery) {
         route.query.zipcode = customZipQuery;
     }
@@ -499,6 +485,7 @@ function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse
 
     mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mocks["$router"] = router;
+    mountOptions.global.mocks.pageName = route.name;
     mountOptions.mixins = [
         {
             methods: {
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 6a94c240b..f6202337c 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -16,7 +16,6 @@ import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { validate } from "vee-validate";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
-import { routerParams } from "@/router/router-constants/router-params";
 import * as cookieHelper from "@/helpers/heritage-integration/cookie-helper";
 
 // Mock our module for promises.
@@ -310,11 +309,11 @@ describe("vehicle-damage.vue", () => {
     describe("alert", () => {
         test("when displayVehicleChangeAlert router params is true, the alert: 'vehicleChangeAlert' should be rendered", () => {
             // Arrange & Act
-            window.history.pushState({ displayVehicleChangeAlert: "true" }, "", "");
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        state: { displayVehicleChangeAlert: true },
+                        name: "vehicle-damage",
+                        query: { displayVehicleChangeAlert: true },
                     },
                 },
             });
@@ -328,8 +327,9 @@ describe("vehicle-damage.vue", () => {
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        state: {
-                            [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false,
+                        name: "vehicle-damage",
+                        query: {
+                            displayVehicleChangeAlert: false,
                         },
                     },
                 },
@@ -345,8 +345,9 @@ describe("vehicle-damage.vue", () => {
             const { wrapper } = setupMocks({
                 mountOptionsMockData: {
                     route: {
-                        params: {
-                            [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: undefined,
+                        name: "vehicle-damage",
+                        query: {
+                            displayVehicleChangeAlert: undefined,
                         },
                     },
                 },
@@ -852,9 +853,8 @@ function setupMocks({ pageHeaderWidgetHeaderText, mountOptionsMockData, funnelCo
             navigateWithSaving: jest.fn(),
         },
         route: {
-            state: {
-                [routerParams.DISPLAY_VEHICLE_CHANGE_ALERT]: false,
-            },
+            name: "vehicle-damage",
+            query: {},
         },
         store: {
             getters: {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index bef6aa032..7dd082867 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -12,7 +12,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 
 // Mock our module for promises.
 jest.mock("@/helpers/layout-helper.js", () => ({
@@ -84,11 +84,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -123,11 +122,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -161,11 +159,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -205,11 +202,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: {
@@ -255,7 +251,7 @@ describe("vehicle-parts.vue", () => {
         //Assert
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-            wrapper.vm.$route
+            wrapper.vm.$route.name
         );
     });
 
@@ -268,11 +264,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: {
@@ -302,7 +297,7 @@ describe("vehicle-parts.vue", () => {
         //Assert
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
             navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-            wrapper.vm.$route
+            wrapper.vm.$route.name
         );
     });
 
@@ -356,11 +351,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -384,7 +378,7 @@ describe("vehicle-parts.vue", () => {
         await wrapper.vm.forwardButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+        expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalled();
     });
 
     test("ForwardButtonAction triggers a router.navigateWithSaving change if there are capability questions", async () => {
@@ -417,11 +411,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -451,7 +444,7 @@ describe("vehicle-parts.vue", () => {
         await wrapper.vm.forwardButtonAction();
 
         //Assert
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+        expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalled();
     });
 
     test("ForwardButtonAction saves selected parts to store if no molding or capability questions", async () => {
@@ -468,11 +461,10 @@ describe("vehicle-parts.vue", () => {
                     navigate: jest.fn(),
                     navigateWithSaving: jest.fn(),
                     navigateWithoutSaving: jest.fn(),
+                    navigateWithPageData: jest.fn(),
                 },
                 route: {
-                    query: {
-                        fmgPage: "vehicle-parts",
-                    },
+                    name: "vehicle-parts",
                 },
                 store: {
                     getters: store.getters,
@@ -544,6 +536,7 @@ function setupMocks({ pageHeaderWidgetHeaderText = {}, mountOptionsMockData = {}
     wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
     wrapper.vm.$refs.navbar.removeLoader = jest.fn();
     wrapper.vm.$refs.loadingModal.showModal = jest.fn();
+    wrapper.vm.pageName = "vehicle-parts";
     // wrapper.vm.$refs.onSubmit = jest.fn();
     // wrapper.vm.$refs.onInvalidSubmit = jest.fn();
 
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index aca9a8af5..9e6a5d7b5 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import vinLookup from "./vin-lookup.vue";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios.js";
 import { settleAllPromises } from "@/helpers/layout-helper.js";
 import { experimentSettings } from "@/constants/experiments";
 
diff --git a/src/mixins/base-mixin.spec.js b/src/mixins/base-mixin.spec.js
index 2484c0871..2d95f95b3 100644
--- a/src/mixins/base-mixin.spec.js
+++ b/src/mixins/base-mixin.spec.js
@@ -1,7 +1,7 @@
 import baseMixin from "@/mixins/base-mixin";
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
-import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
 import { queryStrings } from "@/constants/query-strings";
 import { dynamicStrings } from "@/constants/dynamic-strings";
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 56f4425cc..558adadd0 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -1,11 +1,11 @@
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { storeMutations } from "@/constants/store-mutations";
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
-import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
 import { getters } from "@/store";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
@@ -290,13 +290,13 @@ describe("vehicle-questions-mixin", () => {
 
     describe("currentPageComesBeforePage", () => {
         const testCases = [
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.VEHICLE_PARTS, true],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.QUOTE, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.QUOTE, fmgPageValues.QUOTE, false],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.PART_QUESTIONS, false],
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, true],
-            [fmgPageValues.MOLDING_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, true],
+            [routeData.PART_QUESTIONS, routeData.VEHICLE_PARTS, true],
+            [routeData.VEHICLE_PARTS, routeData.VEHICLE_PARTS, false],
+            [routeData.QUOTE, routeData.VEHICLE_PARTS, false],
+            [routeData.QUOTE, routeData.QUOTE, false],
+            [routeData.VEHICLE_PARTS, routeData.PART_QUESTIONS, false],
+            [routeData.PART_QUESTIONS, routeData.CAPABILITY_QUESTIONS, true],
+            [routeData.MOLDING_QUESTIONS, routeData.CAPABILITY_QUESTIONS, true],
         ];
         test.each(testCases)(
             "%s comes before %s is %s",
@@ -305,7 +305,7 @@ describe("vehicle-questions-mixin", () => {
                 const { wrapper } = setupMocks({});
 
                 // Act
-                const result = wrapper.vm.currentPageComesBeforePage(currentPage, nextPage);
+                const result = wrapper.vm.currentPageComesBeforePage(currentPage.name, nextPage.name);
 
                 // Assert
                 expect(result).toEqual(expectedResult);
@@ -315,20 +315,20 @@ describe("vehicle-questions-mixin", () => {
 
     describe("currentPageComesAfterPage", () => {
         const testCases = [
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.VEHICLE_PARTS, false],
-            [fmgPageValues.QUOTE, fmgPageValues.VEHICLE_PARTS, true],
-            [fmgPageValues.QUOTE, fmgPageValues.QUOTE, false],
-            [fmgPageValues.VEHICLE_PARTS, fmgPageValues.PART_QUESTIONS, true],
-            [fmgPageValues.PART_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, false],
-            [fmgPageValues.MOLDING_QUESTIONS, fmgPageValues.CAPABILITY_QUESTIONS, false],
+            [routeData.PART_QUESTIONS, routeData.VEHICLE_PARTS, false],
+            [routeData.VEHICLE_PARTS, routeData.VEHICLE_PARTS, false],
+            [routeData.QUOTE, routeData.VEHICLE_PARTS, true],
+            [routeData.QUOTE, routeData.QUOTE, false],
+            [routeData.VEHICLE_PARTS, routeData.PART_QUESTIONS, true],
+            [routeData.PART_QUESTIONS, routeData.CAPABILITY_QUESTIONS, false],
+            [routeData.MOLDING_QUESTIONS, routeData.CAPABILITY_QUESTIONS, false],
         ];
         test.each(testCases)("%s comes after %s is %s", (currentPage, nextPage, expectedResult) => {
             // Arrange
             const { wrapper } = setupMocks({});
 
             // Act
-            const result = wrapper.vm.currentPageComesAfterPage(currentPage, nextPage);
+            const result = wrapper.vm.currentPageComesAfterPage(currentPage.name, nextPage.name);
 
             // Assert
             expect(result).toEqual(expectedResult);
@@ -1321,12 +1321,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1436,12 +1434,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1543,12 +1539,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1698,12 +1692,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1746,12 +1738,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -1858,12 +1848,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2036,12 +2024,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2095,12 +2081,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2137,12 +2121,10 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithPageData).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                    wrapper.vm.$route,
-                    {},
-                    {},
+                    wrapper.vm.$route.name,
                     { partsOrQuestions }
                 );
             });
@@ -2315,7 +2297,7 @@ describe("vehicle-questions-mixin", () => {
 
         test("current page is quote, there are no questions, and we have their vin => go to vin-lookup", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE, hasVin: true });
+            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name, hasVin: true });
 
             // Act
             store.dispatch = jest.fn(() => {});
@@ -2324,13 +2306,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.QUOTE } }
+                routeData.QUOTE.name
             );
         });
 
         test("current page is quote and there are capability questions => go to capability questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE });
+            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name });
             wrapper.vm.hasCapabilityQuestions = jest.fn().mockReturnValue(true);
 
             // Act
@@ -2340,13 +2322,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.QUOTE } }
+                routeData.QUOTE.name
             );
         });
 
         test("current page is quote and there are part questions and molding questions => go to molding questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE });
+            const { wrapper } = setupMocks({ fmgPage: routeData.QUOTE.name });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
 
@@ -2356,13 +2338,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.QUOTE } }
+                routeData.QUOTE.name
             );
         });
 
         test("current page is molding questions and there are part questions, multiple parts to choose, and capability questions => go to vehicle-parts", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.MOLDING_QUESTIONS });
+            const { wrapper } = setupMocks({ fmgPage: routeData.MOLDING_QUESTIONS.name });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasGlassLocationWithMultipleParts = jest.fn().mockReturnValue(true);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
@@ -2375,13 +2357,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                { query: { fmgPage: fmgPageValues.MOLDING_QUESTIONS } }
+                routeData.MOLDING_QUESTIONS.name
             );
         });
 
         test("current page is molding questions and there are part questions and capability questions => go to part-questions", async () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.MOLDING_QUESTIONS });
+            const { wrapper } = setupMocks({ fmgPage: routeData.MOLDING_QUESTIONS.name });
             wrapper.vm.hasPartQuestions = jest.fn().mockReturnValue(true);
             wrapper.vm.hasGlassLocationWithMultipleParts = jest.fn().mockReturnValue(false);
             wrapper.vm.hasChildPartQuestions = jest.fn().mockReturnValue(true);
@@ -2394,13 +2376,13 @@ describe("vehicle-questions-mixin", () => {
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
                 navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                { query: { fmgPage: fmgPageValues.MOLDING_QUESTIONS } }
+                routeData.MOLDING_QUESTIONS.name
             );
         });
     });
 });
 
-function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
+function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
     const baseMixin = setupMocksForJsFiles({
         actionList: [
             {
@@ -2423,6 +2405,7 @@ function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
             navigate: jest.fn(),
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
+            navigateWithPageData: jest.fn(),
         },
         store: {
             commit: jest.fn(),
@@ -2436,9 +2419,7 @@ function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
             },
         },
         route: {
-            query: {
-                fmgPage,
-            },
+            name: fmgPage
         },
     });
 
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index ce9c267f9..d9ff6f874 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -58,6 +58,9 @@ function setupMocks({ partsOrQuestions = [] }) {
                 },
             },
         },
+        route: {
+            name: "vin-lookup",
+        },
     });
 
     const mockVinComponent = {
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 69e2feb66..68c8f6761 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -3,7 +3,7 @@ import { mutations, state, actions, getters } from "@/store";
 import { storeMutations } from "@/constants/store-mutations";
 import { storeActions } from "@/constants/store-actions";
 import { experimentTriggers } from "@/constants/experiments";
-import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { routeData } from "@/router/constants/routes";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 
 // Mock global method
@@ -1862,15 +1862,15 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.VEHICLE_PARTS,
+                    page: routeData.VEHICLE_PARTS.name,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             } else {
@@ -1884,15 +1884,15 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.VEHICLE_PARTS,
+                    page: routeData.VEHICLE_PARTS.name,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             }
@@ -2040,11 +2040,11 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             } else {
@@ -2058,11 +2058,11 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: null,
                 });
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             }
@@ -2085,12 +2085,12 @@ describe("Actions", () => {
             ];
 
             mutations.updatePageData(context, {
-                page: fmgPageValues.MOLDING_QUESTIONS,
+                page: routeData.MOLDING_QUESTIONS.name,
                 data: previouslySelectedParts,
             });
 
             mutations.updatePageData(context, {
-                page: fmgPageValues.CAPABILITY_QUESTIONS,
+                page: routeData.CAPABILITY_QUESTIONS.name,
                 data: previouslySelectedParts,
             });
 
@@ -2134,7 +2134,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2187,7 +2187,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2232,7 +2232,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2285,7 +2285,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2330,7 +2330,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2383,7 +2383,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2428,7 +2428,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.MOLDING_QUESTIONS,
+                    page: routeData.MOLDING_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2481,7 +2481,7 @@ describe("Actions", () => {
                 ];
 
                 mutations.updatePageData(context, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: previouslySelectedParts,
                 });
 
@@ -2522,7 +2522,7 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             } else {
@@ -2532,7 +2532,7 @@ describe("Actions", () => {
                     null
                 );
                 expect(context.commit).not.toBeCalledWith(storeMutations.UPDATE_PAGE_DATA, {
-                    page: fmgPageValues.CAPABILITY_QUESTIONS,
+                    page: routeData.CAPABILITY_QUESTIONS.name,
                     data: null,
                 });
             }

From 37679d5f5d0ae9036f8e22b5d47f9469da4c2a15 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:36:40 -0400
Subject: [PATCH 55/64] Reapply "prettier"

This reverts commit 8cd4231ab52442acdee91cde91717ac4195180fc.
---
 src/helpers/unit-test-helper.js                         | 4 +++-
 src/layouts/estimate/estimate.spec.js                   | 2 +-
 src/layouts/insurance-company/insurance-company.spec.js | 2 +-
 src/layouts/return-user/return-user.vue                 | 7 +------
 src/mixins/vehicle-questions-mixin.spec.js              | 7 +++++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 8f3d04183..9ac3edde9 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -77,7 +77,9 @@ export function getMountOptions(mockData) {
         mixins: mockData.mixins,
         stubs: { Form },
         computed: {
-            pageName() { return mockData?.route?.name },
+            pageName() {
+                return mockData?.route?.name;
+            },
         },
     };
     const props = mockData.propsData || {};
diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 38b4ad41e..5217325f9 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -263,7 +263,7 @@ function setupMocks({
             navigateWithoutSaving: jest.fn(),
         },
         route: {
-            name: "estimate"
+            name: "estimate",
         },
     },
 }) {
diff --git a/src/layouts/insurance-company/insurance-company.spec.js b/src/layouts/insurance-company/insurance-company.spec.js
index 540866d5f..7df1f047a 100644
--- a/src/layouts/insurance-company/insurance-company.spec.js
+++ b/src/layouts/insurance-company/insurance-company.spec.js
@@ -26,7 +26,7 @@ jest.mock("@/mixins/base-mixin.js", () => ({
         return {
             navigationScenarios: {
                 CLICKED_BACK: "clicked_back",
-                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own"
+                CLICKED_PAY_ON_MY_OWN: "clicked_pay_on_my_own",
             },
         };
     },
diff --git a/src/layouts/return-user/return-user.vue b/src/layouts/return-user/return-user.vue
index 91df48150..5b397ea76 100644
--- a/src/layouts/return-user/return-user.vue
+++ b/src/layouts/return-user/return-user.vue
@@ -90,12 +90,7 @@ export default {
         },
 
         async startOver() {
-            this.pushEventToGA(
-                this.pageName,
-                this.GaActions.CLICKED,
-                "Start over",
-                true
-            );
+            this.pushEventToGA(this.pageName, this.GaActions.CLICKED, "Start over", true);
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_RESTART,
                 this.pageName
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 558adadd0..0fd027258 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -305,7 +305,10 @@ describe("vehicle-questions-mixin", () => {
                 const { wrapper } = setupMocks({});
 
                 // Act
-                const result = wrapper.vm.currentPageComesBeforePage(currentPage.name, nextPage.name);
+                const result = wrapper.vm.currentPageComesBeforePage(
+                    currentPage.name,
+                    nextPage.name
+                );
 
                 // Assert
                 expect(result).toEqual(expectedResult);
@@ -2419,7 +2422,7 @@ function setupMocks({ fmgPage = routeData.VIN_LOOKUP.name, hasVin, carId }) {
             },
         },
         route: {
-            name: fmgPage
+            name: fmgPage,
         },
     });
 

From 7e211b4682683ebc1c7c280001d0a4c6ad2760c6 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:36:48 -0400
Subject: [PATCH 56/64] Reapply "Update logging for new router."

This reverts commit 2d65f850f1e98a0f5511300af3d23593aaa9ce77.
---
 src/helpers/debug-log-helper.js               | 23 ++++++
 .../heritage-integration/navigation-helper.js | 12 ++-
 src/layouts/payment-method/payment-method.vue | 40 +++++-----
 src/layouts/payment/payment.vue               | 80 +++++++++++--------
 src/layouts/quote/quote.vue                   | 46 ++++-------
 src/layouts/schedule/schedule.vue             | 22 +++--
 src/layouts/vehicle/vehicle.vue               | 14 ++--
 src/mixins/base-mixin.js                      |  7 +-
 src/router/methods/before-each.js             |  4 +
 9 files changed, 132 insertions(+), 116 deletions(-)
 create mode 100644 src/helpers/debug-log-helper.js

diff --git a/src/helpers/debug-log-helper.js b/src/helpers/debug-log-helper.js
new file mode 100644
index 000000000..ea0ac3337
--- /dev/null
+++ b/src/helpers/debug-log-helper.js
@@ -0,0 +1,23 @@
+import store from "@/store";
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { queryStrings } from "@/constants/query-strings";
+import { storeActions } from "@/constants/store-actions";
+
+export function debugLog(message, data, forceLog = false) {
+    checkLogParam();
+
+    if (store?.getters?.applicationUser?.loggingOption || forceLog) {
+        data = data ?? "";
+        const outData = typeof data === "object" ? JSON.stringify(data) : data;
+
+        console.log(`${new Date()} ${message} ${outData}`);
+    }
+}
+
+export function checkLogParam() {
+    const logQueryString = getQuerystringParameter(queryStrings.LOG);
+
+    if (logQueryString) {
+        store?.dispatch(storeActions?.SAVE_LOGGING_OPTION, logQueryString);
+    }
+}
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index ca547b980..90f9593b9 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -8,18 +8,16 @@ import { includesWindshieldReplacement } from "@/helpers/damage-helper";
 import { applicationConfig } from "@/constants/application-config.js";
 import store from "@/store";
 import router from "@/router";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 /*
     Used to navigate to the heritage funnel with the correct query string and url.
 */
 export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) {
-    const log = getQuerystringParameter(queryStrings.LOG);
-    if (log === "true") {
-        console.log("------------- Navigate to heritage start -----------------");
-        console.log(new Date() + " applicationConfig: " + JSON.stringify(applicationConfig));
-        console.log(new Date() + " navigateToHeritageFunnel: " + applicationConfig.HERITAGE_FUNNEL);
-        console.log("------------- Navigate to heritage end -----------------");
-    }
+    debugLog("--- Navigate to heritage start ---");
+    debugLog("applicationConfig:", applicationConfig);
+    debugLog("navigateToHeritageFunnel:", applicationConfig.HERITAGE_FUNNEL);
+    debugLog("--- Navigate to heritage end ---");
 
     // Create the order (or save existing order) when navigating to Heritage Funnel.
     if (shouldSaveSession) {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index e2debfe4a..e0de7fc0f 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -168,6 +168,7 @@ import {
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
 import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -440,26 +441,25 @@ export default {
 
             // prettier-ignore
             {
-                const log = getQuerystringParameter(queryStrings.LOG);
-                const logAsBool = getBoolFromString(log);
-                if (logAsBool || !preReqResult) {
-                    console.log("------------- payment-method.vue pagePrereqs start -----------------");
-                    console.log(new Date() + " serviceLocationReqs::isMobile: " + isMobile);
-                    console.log(new Date() + " serviceLocationReqs::mobileReqs: " + mobileReqs);
-                    console.log(new Date() + " serviceLocationReqs::dropOffInshopReqs: " + dropOffInshopReqs);
-                    console.log(new Date() + " serviceLocationReqs:: result " + serviceLocationReqs);
-                    console.log(new Date() + " isInsuranceSet:: " + isInsuranceSet());
-                    console.log(new Date() + " scheduleReqs::schedule.date:" + schedule.date);
-                    console.log(new Date() + " scheduleReqs::schedule.startTime:" + schedule.startTime);
-                    console.log(new Date() + " scheduleReqs::schedule.endTime:" + schedule.endTime);
-                    console.log(new Date() + " scheduleReqs::schedule.jobMaxMinutes:" + schedule.jobMaxMinutes);
-                    console.log(new Date() + " scheduleReqs::schedule.jobMinMinutes:" + schedule.jobMinMinutes);
-                    console.log(new Date() + " customerReqs::customer.firstName:" + customer.firstName);
-                    console.log(new Date() + " customerReqs::customer.lastName:" + customer.lastName);
-                    console.log(new Date() + " customerReqs::customer.phoneNumber:" + customer.phoneNumber);
-                    console.log(new Date() + " customerReqs::customer.emailAddress:" + customer.emailAddress);
-                    console.log("------------- payment-method.vue pagePrereqs end -----------------");
-                }
+                debugLog("--- payment-method.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("serviceLocationRequs::isMobile:", isMobile, !preReqResult);
+                debugLog("serviceLocationReqs::mobileReqs:", mobileReqs, !preReqResult);
+                debugLog("serviceLocationReqs::dropOffInshopReqs:", dropOffInshopReqs, !preReqResult);
+                debugLog("serviceLocationReqs:: result", serviceLocationReqs, !preReqResult);
+
+                debugLog("isInsuranceSet::", isInsuranceSet(), !preReqResult);
+
+                debugLog("scheduleReqs::schedule.date:", schedule.date, !preReqResult);
+                debugLog("scheduleReqs::schedule.startTime:", schedule.startTime, !preReqResult);
+                debugLog("scheduleReqs::schedule.endTime:", schedule.endTime, !preReqResult);
+                debugLog("scheduleReqs::schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
+                debugLog("scheduleReqs::schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
+
+                debugLog("customerReqs::customer.firstName:", customer.firstName, !preReqResult);
+                debugLog("customerReqs::customer.lastName:", customer.lastName, !preReqResult);
+                debugLog("customerReqs::customer.phoneNumber:", customer.phoneNumber, !preReqResult);
+                debugLog("customerReqs::customer.emailAddress:", customer.emailAddress, !preReqResult);
+                debugLog("--- payment-method.vue pagePrereqs end ---", null, !preReqResult);
             }
 
             return preReqResult;
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 40d772dbb..745d5ebe1 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -238,6 +238,7 @@ import {
     getSubTotal,
     getSalesTax,
 } from "@/helpers/pricing-helper.js";
+import { debugLog } from "@/helpers/debug-log-helper.js";
 
 export default {
     name: "payment",
@@ -545,41 +546,50 @@ export default {
 
             // prettier-ignore
             {
-                if (store.getters.applicationUser.loggingOption || !preReqResult) {
-                    console.log("------------- payment.vue pagePrereqs start -----------------");
-                    console.log(new Date() +  "mobileReqs:" + mobileReqs);
-                    console.log(new Date() +  "serviceLocation.address:" + serviceLocation.address);
-                    console.log(new Date() +  "serviceLocation.city:" + serviceLocation.city);
-                    console.log(new Date() +  "serviceLocation.state:" + serviceLocation.state);
-                    console.log(new Date() +  "serviceLocation.zipCode:" + serviceLocation.zipCode);
-                    console.log("");
-                    console.log(new Date() +  "dropOffInshopReqs:" + dropOffInshopReqs);
-                    console.log(new Date() +  "serviceLocationReqs:" + serviceLocationReqs);
-                    console.log(new Date() +  "providerLocation.streetAddress:" + providerLocation.streetAddress);
-                    console.log(new Date() +  "providerLocation.city:" + providerLocation.city);
-                    console.log(new Date() +  "providerLocation.state:" + providerLocation.state);
-                    console.log(new Date() +  "providerLocation.zipCode:" + providerLocation.zipCode);
-                    console.log("");
-                    console.log(new Date() +  "isInsuranceSet:" + isInsuranceSet);
-                    console.log("");
-                    console.log(new Date() +  "scheduleReqs:" + scheduleReqs);
-                    console.log(new Date() +  "schedule.date:" + schedule.date);
-                    console.log(new Date() +  "schedule.startTime:" + schedule.startTime);
-                    console.log(new Date() +  "schedule.endTime:" + schedule.endTime);
-                    console.log(new Date() +  "schedule.jobMaxMinutes:" + schedule.jobMaxMinutes);
-                    console.log(new Date() +  "schedule.jobMinMinutes:" + schedule.jobMinMinutes);
-                    console.log("");
-                    console.log(new Date() +  "customerReqs:" + customerReqs);
-                    console.log(new Date() +  "customer.firstName:" + customer.firstName);
-                    console.log(new Date() +  "customer.lastName:" + customer.lastName);
-                    console.log(new Date() +  "customer.phoneNumber:" + customer.phoneNumber);
-                    console.log(new Date() +  "customer.emailAddress:" + customer.emailAddress);
-                    console.log("");
-                    console.log(new Date() +  "paymentMethodReqs:" + paymentMethodReqs);
-                    console.log(new Date() +  "store.getters.order.payment.isPia:" + store.getters.order.payment.isPia);
-                    console.log(new Date() +  "store.getters.order.payment.piaType:" + store.getters.order.payment.piaType);
-                    console.log("------------- payment.vue pagePrereqs end -------------------");
-                }
+                debugLog("--- payment.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("mobileReqs:", mobileReqs, !preReqResult);
+                debugLog("serviceLocation.address:", serviceLocation.address, !preReqResult);
+                debugLog("serviceLocation.city:", serviceLocation.city, !preReqResult);
+                debugLog("serviceLocation.state:", serviceLocation.state, !preReqResult);
+                debugLog("serviceLocation.zipCode:", serviceLocation.zipCode, !preReqResult);
+
+                debugLog("", null, !preReqResult);
+
+                debugLog("dropOffInshopReqs:", dropOffInshopReqs, !preReqResult);
+                debugLog("serviceLocationReqs:", serviceLocationReqs, !preReqResult);
+                debugLog("providerLocation.streetAddress:", providerLocation.streetAddress, !preReqResult);
+                debugLog("providerLocation.city:", providerLocation.city, !preReqResult);
+                debugLog("providerLocation.state:", providerLocation.state, !preReqResult);
+                debugLog("providerLocation.zipCode:", providerLocation.zipCode, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+                
+                debugLog("isInsuranceSet:", isInsuranceSet, !preReqResult);
+
+                debugLog("", null, !preReqResult);
+
+                debugLog("scheduleReqs:", scheduleReqs, !preReqResult);
+                debugLog("schedule.date:", schedule.date, !preReqResult);
+                debugLog("schedule.startTime:", schedule.startTime, !preReqResult);
+                debugLog("schedule.endTime:", schedule.endTime, !preReqResult);
+                debugLog("schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
+                debugLog("schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+
+                debugLog("customerReqs:", customerReqs, !preReqResult);
+                debugLog("customer.firstName:", customer.firstName, !preReqResult);
+                debugLog("customer.lastName:", customer.lastName, !preReqResult);
+                debugLog("customer.phoneNumber:", customer.phoneNumber, !preReqResult);
+                debugLog("customer.emailAddress:", customer.emailAddress, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+
+                debugLog("paymentMethodReqs:", paymentMethodReqs, !preReqResult);
+                debugLog("store.getters.order.payment.isPia:", store.getters.order?.payment?.isPia, !preReqResult);
+                debugLog("store.getters.order.payment.piaType:", store.getters.order?.payment?.piaType, !preReqResult);
+
+                debugLog("--- payment.vue pagePrereqs end ---", null, !preReqResult);
             }
 
             return preReqResult;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index a31719dbd..e7039da54 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -171,6 +171,7 @@ import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { routeData } from "@/router/constants/routes";
 import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { storeMutations } from "@/constants/store-mutations";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -462,9 +463,7 @@ export default {
                         baseMixin.methods.getTierOnePackagePrice(lineItemsNoDiscount);
                     // prettier-ignore
                     {
-                        if (store.getters.applicationUser.loggingOption) {
-                            console.log(new Date() + " quote tierOnePrice comparison: " + tierOnePrice + " > " + insuranceThreshold + "=" + (tierOnePrice > insuranceThreshold));
-                        }
+                        debugLog("quote tierOnePrice comparison: " + tierOnePrice + " > " + insuranceThreshold + "=" + (tierOnePrice > insuranceThreshold));
                     }
 
                     // compare base price vs arbitrary threshold (representing insurance price)
@@ -485,21 +484,17 @@ export default {
 
             // prettier-ignore
             {
-                if (store.getters.applicationUser.loggingOption) {
-                    console.log("------------- quote.vue thresholds start -----------------");
-                    console.log(new Date() + " isExternalParameter: " + isExternalParameter);
-                    console.log(new Date() + " internalThreshold: " + internalThreshold);
-                    console.log(new Date() + " externalThreshold: " + externalThreshold);
-                    console.log("------------- quote.vue thresholds end -----------------");
-                }
+                debugLog("--- quote.vue thresholds start ---");
+                debugLog(" isExternalParameter: ", isExternalParameter);
+                debugLog(" internalThreshold: ", internalThreshold);
+                debugLog(" externalThreshold: ", externalThreshold);
+                debugLog("--- quote.vue thresholds end ---");
             }
 
             if (isExternalParameter === externalParameterStatus.NOT_SET) {
                 // prettier-ignore
                 {
-                    if (store.getters.applicationUser.loggingOption) {
-                        console.log(new Date() + "quote.vue tab select EXTERNAL not set");
-                    }
+                    debugLog("quote.vue tab select EXTERNAL not set");
                 }
                 // there are no active or inactive external parameters; use internal threshold
                 if (internalThreshold) thresholdToUse = internalThreshold;
@@ -514,9 +509,7 @@ export default {
                 if (getBoolFromString(store.getters.externalParameterQuote?.isInsurance)) {
                     // prettier-ignore
                     {
-                        if (store.getters.applicationUser.loggingOption) {
-                            console.log(new Date() + "quote.vue tab select EXTERNAL ISINSURANCE");
-                        }
+                        debugLog("quote.vue tab select EXTERNAL ISINSURANCE");
                     }
 
                     const insuranceSelection = true;
@@ -535,9 +528,7 @@ export default {
 
                     // prettier-ignore
                     {
-                        if (store.getters.applicationUser.loggingOption) {
-                            console.log(new Date() + "quote.vue tab select NOT EXTERNAL");
-                        }
+                        debugLog("quote.vue tab select NOT EXTERNAL");
                     }
 
                     vm.isInsuranceSelected = getIsInsuranceSelectedValue(
@@ -653,16 +644,13 @@ export default {
 
             // prettier-ignore
             {
-                const log = getQuerystringParameter(queryStrings.LOG);
-                if (log === "true" || !preReqResult) {
-                    console.log("------------- quote.vue pagePrereqs start -----------------");
-                    console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + store.getters.order.serviceLocation?.zipCode);
-                    console.log(new Date() +" store.getters.order.serviceLocation.zipCodeCtu: " + store.getters.order.serviceLocation?.zipCodeCtu);
-                    console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage?.isRepair);
-                    console.log(new Date() + " store.getters.order.lineItems?.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts));
-                    console.log(new Date() + " store.getters.order.payment.insuranceCoverage?.isVerified: " + payment?.insuranceCoverage?.isVerified);
-                    console.log("------------- quote.vue pagePrereqs end -----------------");
-                }
+                debugLog("--- quote.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCode:", store.getters.order.serviceLocation?.zipCode, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCodeCtu:", store.getters.order.serviceLocation?.zipCodeCtu, !preReqResult);
+                debugLog("store.getters.order.damage.isRepair:", store.getters.order.damage?.isRepair, !preReqResult);
+                debugLog("store.getters.order.lineItems?.glassParts:", store.getters.order.lineItems?.glassParts, !preReqResult);
+                debugLog("store.getters.order.payemt.insuranceCoverage?.isVerified:", store.getters.order.payment?.insuranceCoverage?.isVerified, !preReqResult);
+                debugLog("--- quote.vue pagePrereqs end ---", null, !preReqResult);
             }
 
             return preReqResult;
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b47de1fa8..b752a5d22 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -94,6 +94,7 @@ import { getAmountDue, getPricingByDayPartWithPrice } from "@/helpers/pricing-he
 import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
 import { partNumberStrings } from "@/constants/part-number-strings";
 import { deepClone } from "@/helpers/object-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 // DEFINE VALIDATION RULES
 defineRule("date-required", required(errorMessages.DATE_REQUIRED));
@@ -428,18 +429,15 @@ export default {
 
             // prettier-ignore
             {
-                const log = getQuerystringParameter(queryStrings.LOG);
-                if (log === "true" || !preReqResult) {
-                    console.log("------------- schedule.vue pagePrereqs start -----------------");
-                    console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + serviceLocation.zipCode);
-                    console.log(new Date() + " store.getters.order.serviceLocation.zipCodeCtu: " + serviceLocation.zipCodeCtu);
-                    console.log(new Date() + " store.getters.order.serviceLocation.appointmentType: " + serviceLocation.appointmentType);
-                    console.log(new Date() + " store.getters.order.serviceLocation.provider.providerNumber: " + serviceLocation.provider.providerNumber);
-                    console.log(new Date() + " store.getters.payment.isInsurance: " + store.getters.payment?.isInsurance);
-                    console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage.isRepair);
-                    console.log(new Date() + " store.getters.order.lineItems.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts));
-                    console.log("------------- schedule.vue pagePrereqs end -------------------");
-                }
+                debugLog("--- schedule.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCode:", serviceLocation.zipCode, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.zipCodeCtu:", serviceLocation.zipCodeCtu, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.appointmentType:", serviceLocation.appointmentType, !preReqResult);
+                debugLog("store.getters.order.serviceLocation.provider.providerNumber:", serviceLocation.provider?.providerNumber, !preReqResult);
+                debugLog("store.getters.payment.isInsurance:", store.getters.payment?.isInsurance, !preReqResult);
+                debugLog("store.getters.order.damage.isRepair:", store.getters.order.damage?.isRepair, !preReqResult);
+                debugLog("store.getters.order.lineItems.glassParts:", store.getters.order.lineItems?.glassParts, !preReqResult);
+                debugLog("--- schedule.vue pagePrereqs end ---", null, !preReqResult);
             }
             return preReqResult;
         },
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 174c76530..131073f90 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -114,6 +114,7 @@ import {
     consumeQueryFromStash,
     peekQueryFromStash,
 } from "@/router/methods/helpers/querystring-stash";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 //define validation rules
 defineRule("year-required", required(errorMessages.YEAR_REQUIRED));
@@ -148,15 +149,10 @@ export default {
     },
 
     async beforeRouteEnter(to, from, next) {
-        if (store.getters.applicationUser.loggingOption) {
-            console.log(
-                new Date() + "------------- vehicle.vue applicationConfig start -------------"
-            );
-            console.log(new Date() + JSON.stringify(applicationConfig));
-            console.log(
-                new Date() + "------------- vehicle.vue applicationConfig end -------------"
-            );
-        }
+        debugLog("------------- vehicle.vue applicationConfig start -------------");
+        debugLog("", applicationConfig);
+        debugLog("------------- vehicle.vue applicationConfig end -------------");
+
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.name);
         const experimentForLogging = store.getters.applicationUser.experiments.find(
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 3dfca7dbf..ecce2632d 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -9,6 +9,7 @@ import { dynamicStrings } from "@/constants/dynamic-strings";
 import { partTypeStrings } from "../constants/part-type-strings";
 import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { getItemsWithoutRecalParts } from "@/helpers/recal-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export default {
     data() {
@@ -95,10 +96,8 @@ export default {
             let totalPrice = this.getTotalPriceOfAllLineItemsAndChildParts(lineItemsToPrice, false);
             // prettier-ignore
             {
-                if (store.getters.applicationUser.loggingOption) {
-                    console.log(new Date() + " base-mixin getTierOnePackagePrice lineItemsToPrice: " + JSON.stringify(lineItemsToPrice));
-                    console.log(new Date() + " base-mixin getTierOnePackagePrice totalPrice: " + totalPrice);
-                }
+                debugLog("base-mixin getTierOnePackagePrice lineItemsToPrice:", lineItemsToPrice);
+                debugLog("base-mixin getTierOnePackagePrice totalPrice:", totalPrice);
             }
             return totalPrice;
         },
diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index dae53b583..aa4e3a9e4 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -13,6 +13,7 @@ import { runExperiments } from "@/router/methods/helpers/run-experiments";
 
 import { bailout } from "@/router/methods/error";
 import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
+import { checkLogParam } from "@/helpers/debug-log-helper";
 
 export async function beforeEach(to, from) {
     try {
@@ -53,6 +54,9 @@ export async function beforeEach(to, from) {
             await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
         }
 
+        // Update if logging is enabled.
+        checkLogParam();
+
         // Ensure page-prerequisites are fulfilled
         const arePagePrerequisitesValid = await checkPagePrerequisites(to.name);
 

From 5080aa90d9d2335e6370df7d50d70ea48b789427 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:36:56 -0400
Subject: [PATCH 57/64] Reapply "Only save session on nav if email or phone
 number is present"

This reverts commit a0dfd151e1133ce0bfb60546a9026efa273f4e5a.
---
 src/router/methods/navigate.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/router/methods/navigate.js b/src/router/methods/navigate.js
index 7df947560..b15c955e9 100644
--- a/src/router/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -3,6 +3,7 @@ import { buildManualUrl } from "@/router/methods/helpers/build-manual-url";
 import { getDestination } from "@/router/methods/helpers/get-destination";
 import { savePageData } from "@/router/methods/helpers/save-page-data";
 import router from "@/router";
+import store from "@/store";
 
 import { bailout } from "@/router/methods/error";
 
@@ -34,7 +35,12 @@ async function navigate(scenario, currentPageName, withSaving = false, forceTopL
     }
 
     if (withSaving) {
-        await saveSession({ pageNameToLog: nextPage.name });
+        if (
+            store.getters?.applicationUser?.savedSessionId ||
+            store.getters?.order?.customer?.emailAddress
+        ) {
+            await saveSession({ pageNameToLog: nextPage.name });
+        }
     }
 
     // Some pages require manually setting the next url

From 96bc7737970a76ded45bdf57b0fdcad030920e24 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:37:04 -0400
Subject: [PATCH 58/64] Reapply "debug return from heritage"

This reverts commit 25dfa5d74c6343deedbe2acc1856c2e7d821d93a.
---
 src/router/methods/before-each.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index aa4e3a9e4..734385700 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -14,11 +14,18 @@ import { runExperiments } from "@/router/methods/helpers/run-experiments";
 import { bailout } from "@/router/methods/error";
 import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 import { checkLogParam } from "@/helpers/debug-log-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export async function beforeEach(to, from) {
     try {
         await analyticsMixin.methods.validateSession();
 
+        // prettier-ignore
+        {
+            debugLog(`--- before-each.js ${from?.name} start ---`);
+            debugLog(" funnel cookie init: ", getFunnelCookie());
+        }
+
         if (getFunnelCookie()?.SuppressConceptFunnel) {
             // Redirect to heritage.
             return {
@@ -48,6 +55,12 @@ export async function beforeEach(to, from) {
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
+        // prettier-ignore
+        {
+            debugLog(`--- before-each.js ${from?.name} start ---`);
+            debugLog(" funnel cookie after: ", getFunnelCookie());
+        }
+
         // If sent from heritage, need to load session.
         const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
         if (fromHeritageFlag) {
@@ -72,6 +85,12 @@ export async function beforeEach(to, from) {
         }
 
         await runExperiments(to.name);
+
+        // prettier-ignore
+        {
+            debugLog("--- before-each.js end ---");
+        }
+
     } catch (error) {
         const errorPayload = {
             cause: "Uncaught exception in `beforeEach`.",

From 06eab76a395c85bfd81a76b7d04ef76e48bb45cd Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:37:12 -0400
Subject: [PATCH 59/64] Reapply "prettier"

This reverts commit 47f3a6cee9b82a307d822cb574c7eca643378911.
---
 src/router/methods/before-each.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 734385700..84514f6c2 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -90,7 +90,6 @@ export async function beforeEach(to, from) {
         {
             debugLog("--- before-each.js end ---");
         }
-
     } catch (error) {
         const errorPayload = {
             cause: "Uncaught exception in `beforeEach`.",

From 999b188af6a49a6be229e1fe2e774e3b1360080a Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:37:24 -0400
Subject: [PATCH 60/64] Reapply "Progress bar cleanup"

This reverts commit fa5b4bd4cc1f5e1e088ccc2a4881b646fff15497.
---
 .../funnel-header/progress-bar/progres-bar.spec.js |  8 ++++----
 .../funnel-header/progress-bar/progress-bar.vue    | 14 +++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
index a8d22cc2c..9970b266c 100644
--- a/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
+++ b/src/fmg-components/funnel-header/progress-bar/progres-bar.spec.js
@@ -15,7 +15,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(0);
+        expect(wrapper.vm.progress).toBe(0);
         wrapper.unmount();
     });
 });
@@ -33,7 +33,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(4);
+        expect(wrapper.vm.progress).toBe(4);
         wrapper.unmount();
     });
 });
@@ -51,7 +51,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(48);
+        expect(wrapper.vm.progress).toBe(48);
         wrapper.unmount();
     });
 });
@@ -69,7 +69,7 @@ describe("progressBar", () => {
         });
 
         // Assert
-        expect(wrapper.vm.getProgress()).toBe(100);
+        expect(wrapper.vm.progress).toBe(100);
         wrapper.unmount();
     });
 });
diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index da370e415..c25476338 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -10,15 +10,11 @@ import { getProgressBarPercentage } from "@/constants/progress-bar-mapper";
 
 export default {
     name: "progressBar",
-    data() {
-        return {
-            progress: this.getProgress(),
-        };
-    },
-    methods: {
-        getProgress() {
-            var pageName = this.pageName;
-            return getProgressBarPercentage(pageName);
+    data() {},
+    computed: {
+        progress() {
+            console.log(`Progress: ${this.pageName} - ${getProgressBarPercentage(this.pageName)}`);
+            return getProgressBarPercentage(this.pageName);
         },
     },
 };

From b6cd797a537c1d99e73e98caf2e643fefd197c9a Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:37:33 -0400
Subject: [PATCH 61/64] Reapply "Remove console log"

This reverts commit efc354699aa008d98b181c0067242cc88b92d540.
---
 src/fmg-components/funnel-header/progress-bar/progress-bar.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
index c25476338..ebce6e0de 100644
--- a/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
+++ b/src/fmg-components/funnel-header/progress-bar/progress-bar.vue
@@ -13,7 +13,6 @@ export default {
     data() {},
     computed: {
         progress() {
-            console.log(`Progress: ${this.pageName} - ${getProgressBarPercentage(this.pageName)}`);
             return getProgressBarPercentage(this.pageName);
         },
     },

From 567a881766cf47222ca4d8a28a3957a5c42bba02 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:37:42 -0400
Subject: [PATCH 62/64] Reapply "Load session before updating funnel cookie"

This reverts commit d8c838f530a5183809de3068afd2e83ee51aba19.
---
 src/router/methods/before-each.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 84514f6c2..3a293f98b 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -52,6 +52,12 @@ export async function beforeEach(to, from) {
             }
         }
 
+        // If sent from heritage, need to load session.
+        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
+        if (fromHeritageFlag) {
+            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+        }
+
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
@@ -61,12 +67,6 @@ export async function beforeEach(to, from) {
             debugLog(" funnel cookie after: ", getFunnelCookie());
         }
 
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
-
         // Update if logging is enabled.
         checkLogParam();
 

From 24be917e3a9ae5b4d84a68295fe9fed0211dd8ea Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 May 2025 16:50:05 -0400
Subject: [PATCH 63/64] More logging

---
 src/router/methods/before-each.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index 3a293f98b..ba6c41940 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -58,13 +58,19 @@ export async function beforeEach(to, from) {
             await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
         }
 
+        // prettier-ignore
+        {
+            debugLog(`--- before-each.js ${from?.name} mid ---`);
+            debugLog(" funnel cookie after load: ", getFunnelCookie());
+        }
+
         // Process funnel cookie.
         updateOrCreateFunnelCookie();
 
         // prettier-ignore
         {
-            debugLog(`--- before-each.js ${from?.name} start ---`);
-            debugLog(" funnel cookie after: ", getFunnelCookie());
+            debugLog(`--- before-each.js ${from?.name} end ---`);
+            debugLog(" funnel cookie after update: ", getFunnelCookie());
         }
 
         // Update if logging is enabled.

From 3d30648199b5c972c8ff28fe67bb0f147899b089 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 14 May 2025 11:48:37 -0400
Subject: [PATCH 64/64] Cleanup timing for heritage-return session load

---
 src/router/methods/before-each.js                | 11 +++--------
 .../methods/helpers/handle-heritage-return.js    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 src/router/methods/helpers/handle-heritage-return.js

diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js
index ba6c41940..923059b34 100644
--- a/src/router/methods/before-each.js
+++ b/src/router/methods/before-each.js
@@ -1,20 +1,18 @@
-import { queryStrings } from "@/constants/query-strings";
 import { sessionStorageKeyConstants } from "@/constants/session-storage";
 import {
     getFunnelCookie,
     updateOrCreateFunnelCookie,
 } from "@/helpers/heritage-integration/cookie-helper";
-import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
 import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper";
 import analyticsMixin from "@/mixins/analytics-mixin";
 import { routeData, FUNNEL_START_PAGE } from "@/router/constants/routes";
-import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
 import { runExperiments } from "@/router/methods/helpers/run-experiments";
 
 import { bailout } from "@/router/methods/error";
 import { checkPagePrerequisites } from "@/router/methods/page-prerequisites";
 import { checkLogParam } from "@/helpers/debug-log-helper";
 import { debugLog } from "@/helpers/debug-log-helper";
+import { handleHeritageReturn } from "@/router/methods/helpers/handle-heritage-return";
 
 export async function beforeEach(to, from) {
     try {
@@ -52,11 +50,8 @@ export async function beforeEach(to, from) {
             }
         }
 
-        // If sent from heritage, need to load session.
-        const fromHeritageFlag = consumeQueryFromStash(queryStrings.FROM_HERITAGE);
-        if (fromHeritageFlag) {
-            await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
-        }
+        // Special logic when returning from insurance flow.
+        await handleHeritageReturn(to, from);
 
         // prettier-ignore
         {
diff --git a/src/router/methods/helpers/handle-heritage-return.js b/src/router/methods/helpers/handle-heritage-return.js
new file mode 100644
index 000000000..7914c8e0e
--- /dev/null
+++ b/src/router/methods/helpers/handle-heritage-return.js
@@ -0,0 +1,16 @@
+import { queryStrings } from "@/constants/query-strings";
+import { consumeReferralQuerystrings } from "@/router/methods/helpers/consume-referral-info";
+import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper";
+import { routeData } from "@/router/constants/routes";
+
+export async function handleHeritageReturn(to, from) {
+    const fromHeritageFlag = to.query[queryStrings.FROM_HERITAGE];
+
+    if (fromHeritageFlag) {
+        // Get new referral info from querystring in case passed there.
+        await consumeReferralQuerystrings();
+
+        // load session with new cookie
+        await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name);
+    }
+}