diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index 02e6863e..4ca3523b 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -162,7 +162,8 @@ function mapStringToModal(str) {
     const params = linkToReplace.substring((dynamicStrings.MODAL_LINK).length + 2, linkToReplace.length - 1);
     const splitParams = params.split(',');
 
-    const bodyText = `<a modalTarget="${splitParams[0]}" class="modal-text" aria-label="Modal window">${splitParams[1]}</a>`;
+    const bodyText
+        = `<a href="#" modalTarget="${splitParams[0]}" class="modal-text" aria-label="Modal window">${splitParams[1]}</a>`;
 
     let returnVal = str.replace(linkToReplace, bodyText);
 
diff --git a/src/iss-components/loading-modal/loading-modal.spec.js b/src/iss-components/loading-modal/loading-modal.spec.js
index 67767bc8..54459fab 100644
--- a/src/iss-components/loading-modal/loading-modal.spec.js
+++ b/src/iss-components/loading-modal/loading-modal.spec.js
@@ -26,4 +26,16 @@ describe('loadingModal', () => {
         expect(wrapper.vm.isModalVisible).toEqual(true);
         wrapper.unmount();
     });
+    test('hideModal sets modal invisible', async () => {
+        // Arrange
+        const { wrapper } = setupMocks();
+        wrapper.vm.isModalVisible = true;
+
+        // Act
+        wrapper.vm.hideModal();
+
+        // Assert
+        expect(wrapper.vm.isModalVisible).toEqual(false);
+        wrapper.unmount();
+    });
 });
diff --git a/src/iss-components/loading-modal/loading-modal.vue b/src/iss-components/loading-modal/loading-modal.vue
index 13731b93..fb7c270a 100644
--- a/src/iss-components/loading-modal/loading-modal.vue
+++ b/src/iss-components/loading-modal/loading-modal.vue
@@ -16,32 +16,10 @@
                 <div class="row">
                     <div class="col">
                         <div class="text-container slide">
-                            <p>
-                                Finding shops near you
-                                <span class="dot-1">.</span>
-                                <span class="dot-2">.</span>
-                                <span class="dot-3">.</span>
-                            </p>
-                            <p>
-                                Looking for dates
-                                <span class="dot-1">.</span>
-                                <span class="dot-2">.</span>
-                                <span class="dot-3">.</span>
-                            </p>
-                            <p>
-                                Searching for times
-                                <span class="dot-1">.</span>
-                                <span class="dot-2">.</span>
-                                <span class="dot-3">.</span>
-                            </p>
-                            <p>
-                                Nearly there
-                                <span class="dot-1">.</span>
-                                <span class="dot-2">.</span>
-                                <span class="dot-3">.</span>
-                            </p>
-                            <p>
-                                Finishing up
+                            <p
+                                v-for="text in textSlides"
+                                :key="text">
+                                {{ text }}
                                 <span class="dot-1">.</span>
                                 <span class="dot-2">.</span>
                                 <span class="dot-3">.</span>
@@ -56,7 +34,10 @@
 
 <script>
 export default {
-    name: 'modal',
+    name: 'loading-modal',
+    props: {
+        textSlides: Array
+    },
     data() {
         return {
             isModalVisible: false
@@ -76,6 +57,9 @@ export default {
                     }
                 },
                 false);
+        },
+        hideModal() {
+            this.isModalVisible = false;
         }
     }
 };
diff --git a/src/iss-components/questions-page-layout/questions-page-layout.vue b/src/iss-components/questions-page-layout/questions-page-layout.vue
index f16cbed7..aed4902c 100644
--- a/src/iss-components/questions-page-layout/questions-page-layout.vue
+++ b/src/iss-components/questions-page-layout/questions-page-layout.vue
@@ -1,7 +1,9 @@
 <template>
     <div :class="`page-container-grouped-styles questions-page`">
         <div class="fade-on-route-transition position-relative">
-            <loadingModal ref="loadingModal" />
+            <loadingModal
+                ref="loadingModal"
+                :textSlides="loadingText" />
             <siteHeader cmsWidgetName="SiteHeaderWidget" />
             <div class="select-car">
                 <div class="container-fluid pb-2">
@@ -77,6 +79,7 @@ export default {
         questionsData: Array,
         validationRules: String,
         modelValue: Object,
+        loadingText: Array,
         index: Number
     },
     emits: ['update:modelValue', 'forwardButtonAction', 'back-click'],
diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 6960daab..0ecd25da 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -6,6 +6,9 @@
     @invalidSubmit="onInvalidSubmit">
       <div class="page-container-grouped-styles">
           <div class="fade-on-route-transition position-relative">
+              <loadingModal
+                ref="loadingModal"
+                :textSlides="loadingText" />
               <siteHeader cmsWidgetName="SiteHeaderWidget" />
               <div class="select-car">
                   <div class="container-fluid pb-2">
@@ -102,6 +105,7 @@ import recalModal from '@/layouts/coverage-statement/recal-modal/recal-modal';
 import alert from '@/ux-components/alert/alert';
 import contentGroupModal from '@/iss-components/content-group-modal/content-group-modal';
 import buttonQuestion from '@/digital-components/button-question/button-question';
+import loadingModal from '@/iss-components/loading-modal/loading-modal';
 
 // Import Supporting Files
 import { fetchCmsContentForPage, setupModalLinks, processIfStatements } from '@/helpers/cms-content-helper.js';
@@ -111,8 +115,7 @@ import { useMainStore } from '@/store/index.js';
 import vehicleQuestionsMixin from '@/mixins/vehicle-questions-mixin.js';
 import globalRules from '@/constants/global-rules.js';
 import baseFormMixin from '@/mixins/base-form-mixin.js';
-
-const store = useMainStore();
+import navigationScenarios from '@/router/router-constants/navigation-scenarios.js';
 
 export default {
     name: 'coverage-statement',
@@ -124,14 +127,15 @@ export default {
         recalModal,
         alert,
         contentGroupModal,
-        buttonQuestion
+        buttonQuestion,
+        loadingModal
     },
     mixins: [baseFormMixin, vehicleQuestionsMixin],
-    async beforeRouteEnter(to, from, next) {
-    // Call APIs
+    async beforeRouteEnter(to, _from, next) {
+        // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
 
-        const supportingItemsPromise = await store.getSupportingItems();
+        const supportingItemsPromise = await useMainStore().getSupportingItems();
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -145,44 +149,34 @@ export default {
             }
         ];
 
-        if (useMainStore().policy.policyLookupSuccessful
-        && useMainStore().isClaimRegistrationRequired
-        && !useMainStore().policy.noCoverage) {
-            const registerClaimResponse = await useMainStore().registerClaim();
-            promiseResultMap.push({
-                resultKey: 'registerClaim',
-                promise: registerClaimResponse
-            });
-        }
-
         const resultMap = await settleAllPromises(promiseResultMap);
-
-        const clonedGlassParts = store.order.lineItems.glassParts
-            ? JSON.parse(JSON.stringify(store.order.lineItems.glassParts))
+        const clonedGlassParts = useMainStore().order.lineItems.glassParts
+            ? JSON.parse(JSON.stringify(useMainStore().order.lineItems.glassParts))
             : [];
         const availableLineItems = [
             ...resultMap.supportingItems,
             ...clonedGlassParts
         ];
 
-        const pricingResults = await store.getPriceOrderItems(availableLineItems);
+        const pricingResults = await useMainStore().getPriceOrderItems(availableLineItems);
 
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.pricedGlassParts = clonedGlassParts;
-            vm.supportingItems = resultMap.supportingItems;
             vm.availableLineItems = pricingResults;
         });
     },
     data() {
         return {
-            isVerified: store.order.payment.insuranceCoverage.isVerified,
-            supportingItems: [],
-            pricedGlassParts: [],
             availableLineItems: [],
             selectedProvider: '',
             deductibleText: 'Your deductible is:',
+            // TODO update when design team gives appropriate text
+            loadingText: [
+                'Connecting to your insurance company',
+                'Nearly there',
+                'Finishing up'
+            ],
             rules: {
                 selectionRequired: globalRules.OPTION_REQUIRED
             }
@@ -198,24 +192,19 @@ export default {
                 'BodyText').replaceAll('{custom:costSavings}', this.costSavings);
         },
         coverageStatementSubHeader() {
-            const subheader = this.getSubheaderTextFromCms('SiteSubHeaderWidget');
-            return subheader;
+            return this.getSubheaderTextFromCms('SiteSubHeaderWidget');
         },
         secondaryText() {
-            const secondaryText = this.getSecondaryTextFromCms('SiteSubHeaderWidget');
-            return secondaryText;
+            return this.getSecondaryTextFromCms('SiteSubHeaderWidget');
         },
         explanatoryText() {
-            const explanatoryText = this.getExplantoryTextFromCms('ExplanatoryTextWidget');
-            return explanatoryText;
+            return this.getExplantoryTextFromCms('ExplanatoryTextWidget');
         },
         nextStepsHeader() {
-            const header = this.getHeaderTextFromCms('NextStepsWidget');
-            return header;
+            return this.getHeaderTextFromCms('NextStepsWidget');
         },
         nextStepsBody() {
-            const body = this.getBodyTextFromCms('NextStepsWidget').replaceAll('{custom:damage}', this.damageText);
-            return body;
+            return this.getBodyTextFromCms('NextStepsWidget').replaceAll('{custom:damage}', this.damageText);
         },
         continueWithSchedulingBodyText() {
             return this.getCmsContent('continueWithSchedulingCopy', 'BodyText');
@@ -234,66 +223,51 @@ export default {
             return damageString === 'match' ? '' : damageString;
         },
         vehicleDeductible() {
-            if (this.coverageVerified) {
-                if (store.order.damage.isRepair) {
-                    const repairDeductible = store.order.policy.deductible.repair;
-                    return repairDeductible;
-                }
-
-                const replaceDeductible = store.order.policy.deductible.replace;
-                return replaceDeductible;
+            if (useMainStore().order.damage.isRepair) {
+                const repairDeductible = useMainStore().order.policy.deductible.repair;
+                return repairDeductible;
             }
-            return null;
+
+            const replaceDeductible = useMainStore().order.policy.deductible.replace;
+            return replaceDeductible;
         },
         formattedDeductible() {
             return this.getDeductibleString(this.vehicleDeductible);
         },
         isDeductibleZero() {
-            if (this.coverageVerified && this.verifiedDeductible) {
-                return this.vehicleDeductible === 0;
-            }
-            return null;
+            return this.vehicleDeductible === 0;
         },
-        deductibleOverZero() {
-            if (this.coverageVerified && this.verifiedDeductible) {
-                return !this.isDeductibleZero;
-            }
-            return null;
+        policyLookupSuccessful() {
+            return useMainStore().order.policy.policyLookupSuccessful;
         },
-        coverageVerified() {
-            return this.isVerified;
-        },
-        coverageUnverified() {
-            return !this.isVerified;
+        registerClaimSuccessful() {
+            return useMainStore().payment.insuranceCoverage.isVerified;
         },
         verifiedNoComp() {
-            return this.coverageVerified ? store.order.policy.noCoverage : false;
+            return this.policyLookupSuccessful ? useMainStore().order.policy.noCoverage : false;
         },
         verifiedITAC() {
-            return this.coverageVerified
+            return this.policyLookupSuccessful
                 && !this.verifiedNoComp
                 && this.vehicleDeductible > this.totalServicePrice;
         },
+        coveredAndServicePriceAboveOrEqualDeductible() {
+            return !this.verifiedNoComp && this.totalServicePrice >= this.vehicleDeductible;
+        },
         verifiedDeductible() {
-            return this.coverageVerified
-                && !this.verifiedNoComp
-                && this.totalServicePrice > this.vehicleDeductible;
+            return useMainStore().isClaimRegistrationRequired
+                ? this.registerClaimSuccessful && this.coveredAndServicePriceAboveOrEqualDeductible
+                : this.policyLookupSuccessful && this.coveredAndServicePriceAboveOrEqualDeductible;
         },
-        ADASReplace() {
-            if (!store.order.damage.isRepair) {
-                const parts = store.order.lineItems.glassParts;
-
-                if (parts != null && parts.filter((part) => part.requiresRecalibration).length > 0) {
-                    return true;
-                }
-            }
-            return false;
+        unverified() {
+            return !this.verifiedDeductible && !this.verifiedITAC && !this.verifiedNoComp;
         },
-        nonADASReplace() {
-            return !this.ADASReplace;
+        isADAS() {
+            const parts = useMainStore().order.lineItems.glassParts;
+            return parts !== null && !!parts.find((part) => part.requiresRecalibration);
         },
-        nonADASRepair() {
-            return store.order.damage.isRepair;
+        isRepair() {
+            return useMainStore().order.damage.isRepair;
         },
         totalServicePrice() {
             let total = 0;
@@ -329,34 +303,42 @@ export default {
             }
         }
     },
-    mounted() {
+    async mounted() {
+        this.$refs.loadingModal.showModal();
         setupModalLinks(this);
+        const vm = this;
+        if (this.policyLookupSuccessful
+            && useMainStore().isClaimRegistrationRequired
+            && this.coveredAndServicePriceAboveOrEqualDeductible) {
+            await useMainStore().registerClaim().catch(() => {});
+        }
+        vm.$refs.loadingModal.hideModal();
     },
     methods: {
         arePagePrerequisitesValid() {
-            if (useMainStore().vehicle.vin) {
-                return true;
-            }
-            return false;
+            return !!useMainStore().vehicle.vin;
         },
         async forwardButtonAction() {
             return this.navigateForward();
         },
         async navigateForward() {
-            if (this.coverageUnverified || this.verifiedDeductible) {
-                this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD,
+            if (this.unverified || this.verifiedDeductible) {
+                this.$router.navigate(navigationScenarios.CLICKED_FORWARD,
                     this.$route);
             } else if (this.verifiedITAC || this.verifiedNoComp) {
                 if (this.selectedProvider === 'Safelite') {
-                    this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD_WITH_SAFELITE,
+                    this.$router.navigate(navigationScenarios.CLICKED_FORWARD_WITH_SAFELITE,
                         this.$route);
-                } else if (store.issConfig.enableTPAFlow) {
-                    this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD_WITH_THIRD_PARTY,
+                } else if (useMainStore().issConfig.enableTPAFlow) {
+                    this.$router.navigate(navigationScenarios.CLICKED_FORWARD_WITH_TPA_ENABLED,
                         this.$route);
                 } else {
-                    this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD_WITH_BAILOUT,
+                    this.$router.navigate(navigationScenarios.CLICKED_FORWARD_WITH_TPA_DISABLED,
                         this.$route);
                 }
+            } else {
+                this.$router.navigate(navigationScenarios.CLICKED_FORWARD_WITH_INVALID_STATE,
+                    this.$route);
             }
         },
         openModalAction(modalName) {
@@ -386,7 +368,7 @@ export default {
         getCustomValueFromString(str) {
             switch (str) {
             case 'coverageUnverified':
-                return this.coverageUnverified;
+                return this.unverified;
             case 'verifiedDeductible':
                 return this.verifiedDeductible;
             case 'verifiedITAC':
@@ -394,15 +376,15 @@ export default {
             case 'verifiedNoComp':
                 return this.verifiedNoComp;
             case 'ADASReplace':
-                return this.ADASReplace;
+                return !this.isRepair && this.isADAS;
             case 'nonADASReplace':
-                return this.nonADASReplace;
+                return !this.isRepair && !this.isADAS;
             case 'nonADASRepair':
-                return this.nonADASRepair;
+                return this.isRepair;
             case 'deductibleOverZero':
-                return this.deductibleOverZero;
+                return this.verifiedDeductible && !this.isDeductibleZero; // TODO what if deductible is negative?
             case 'isDeductibleZero':
-                return this.isDeductibleZero;
+                return this.verifiedDeductible && this.isDeductibleZero;
             default:
                 return null;
             }
@@ -419,8 +401,7 @@ export default {
             return `$${formattedPriceFloat}`;
         },
         getITACCostSavings(vehicleDeductible, totalServicePrice) {
-            const savings = vehicleDeductible - totalServicePrice;
-            return savings;
+            return vehicleDeductible - totalServicePrice;
         }
     }
 };
diff --git a/src/layouts/provider-preference/provider-preference.vue b/src/layouts/provider-preference/provider-preference.vue
index 9a9b1439..6a1f15fe 100644
--- a/src/layouts/provider-preference/provider-preference.vue
+++ b/src/layouts/provider-preference/provider-preference.vue
@@ -218,12 +218,6 @@ export default {
     color: $black;
 }
 
-.modal-link a{
-    color: $blue-700;
-    font-size: 14px;
-    line-height: 24px;
-    font-weight: 500;
-}
 .question-text {
     margin-top: 0;
     margin-bottom: .5rem;
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index 43e15a33..0ebe471a 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -32,7 +32,9 @@
                 </div>
             </div>
         </div>
-        <loadingModal ref="loadingModal" />
+        <loadingModal
+            ref="loadingModal"
+            :textSlides="loadingText" />
         <contentGroupModal
             ref="RainDefenseModal"
             cmsWidgetName="RainDefenseModal" />
@@ -133,6 +135,13 @@ export default {
             availableLineItems: [],
             supportingItems: [],
             pricedGlassParts: [],
+            loadingText: [
+                'Finding shops near you',
+                'Looking for dates',
+                'Searching for times',
+                'Nearly there',
+                'Finishing up'
+            ],
             rules: {
                 optionRequired: globalRules.OPTION_REQUIRED
             }
diff --git a/src/layouts/vehicle-lookup/vehicle-lookup.vue b/src/layouts/vehicle-lookup/vehicle-lookup.vue
index 2bb2b231..b93c0c66 100644
--- a/src/layouts/vehicle-lookup/vehicle-lookup.vue
+++ b/src/layouts/vehicle-lookup/vehicle-lookup.vue
@@ -106,7 +106,6 @@ export default {
         forwardButtonAction() {
             switch (this.selectedVinLookupMethod) {
             case vinLookupMethodSelections.MANUALVIN:
-                useMainStore().updateVehicleVin(null);
                 this.$router.navigate(this.navigationScenarios.SELECTED_MANUAL_VIN, this.$route);
                 break;
             case vinLookupMethodSelections.LICENSEPLATE:
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index c0df63e8..1eaa2b3e 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -210,7 +210,7 @@ export default {
             let isSelectedGlassAvailableForVehicle = true;
             if (this.isCarIdDifferentFromTheStore) {
                 isSelectedGlassAvailableForVehicle
-                = await isGlassAvailableForCarId(this.vehicleFromLookup.carId);
+                 = await isGlassAvailableForCarId(this.vehicleFromLookup.carId);
             }
 
             // navigate back to vehicle-damage
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index fa364f9f..0d1bfdac 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -2,544 +2,561 @@ import { issPageValues } from '@/router/router-constants/issPage-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 = () => [
-    {
-        issPageValue: issPageValues.VEHICLE_SELECTION,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.VEHICLE_DAMAGE,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.VEHICLE_SELECTION
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_REPAIR,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.VEHICLE_LOOKUP,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            },
-            {
-                scenario: navigationScenarios.SELECTED_MANUAL_VIN,
-                destinationIssPageValue: issPageValues.VIN_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
-                destinationIssPageValue: issPageValues.LICENSE_PLATE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
-                destinationIssPageValue: issPageValues.ADDRESS_LOOKUP
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.VIN_LOOKUP,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_BAILOUT,
-                destinationIssPageValue: issPageValues.BAILOUT_PAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.LICENSE_PLATE_LOOKUP,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.PART_QUESTIONS,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.VIN_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.VEHICLE_PARTS,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.REVEAL
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.VIN_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.MOLDING_QUESTIONS,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.VIN_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.CAPABILITY_QUESTIONS,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.VIN_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.ADDRESS_LOOKUP,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
-                destinationIssPageValue: issPageValues.ADDRESS_VEHICLES
-            },
-            {
-                scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.ADDRESS_VEHICLES,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.ADDRESS_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.ENTRY_PAGE,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.ENTRY_PAGE
-            },
-            {
-                scenario: navigationScenarios.MOVE_FORWARD_ENTRY_PAGE,
-                destinationIssPageValue: issPageValues.WELCOME_PAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.WELCOME_PAGE,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.WELCOME_PAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_POLICY_UNVERIFIED,
-                destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED_NO_VEHICLES,
-                destinationIssPageValue: issPageValues.VEHICLE_SELECTION
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED_WITH_VEHICLES,
-                destinationIssPageValue: issPageValues.POLICY_VEHICLES
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.POLICY_HOLDER_DETAILS,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.WELCOME_PAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_POLICY_UNVERIFIED,
-                destinationIssPageValue: issPageValues.VEHICLE_SELECTION
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED,
-                destinationIssPageValue: issPageValues.POLICY_VEHICLES
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.POLICY_VEHICLES,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.WELCOME_PAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_LISTED_VEHICLE,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_NON_LISTED_VEHICLE,
-                destinationIssPageValue: issPageValues.VEHICLE_SELECTION
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_BAILOUT,
-                destinationIssPageValue: issPageValues.BAILOUT_PAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.COVERAGE_STATEMENT,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
-                destinationIssPageValue: issPageValues.VIN_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
-                destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
-                destinationIssPageValue: issPageValues.PART_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
-                destinationIssPageValue: issPageValues.VEHICLE_PARTS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
-                destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
-                destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_BACK_WITH_REPAIR,
-                destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.PROVIDER_PREFERENCE,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_SAFELITE,
-                destinationIssPageValue: issPageValues.SERVICE_LOCATION
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_ENABLED,
-                destinationIssPageValue: issPageValues.TPA_SEARCH
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_DISABLED,
-                destinationIssPageValue: issPageValues.BAILOUT_PAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.SERVICE_LOCATION,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.SCHEDULE_PAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.SCHEDULE_PAGE,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.SERVICE_LOCATION
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.CONTACT_DETAILS
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.CONTACT_DETAILS,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.SCHEDULE_PAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.SERVICE_PACKAGES
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.SERVICE_PACKAGES,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.CONTACT_DETAILS
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.REVIEW_PAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.REVIEW_PAGE,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.SERVICE_PACKAGES
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.PAYMENT_PAGE
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.PAYMENT_PAGE,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_BACK,
-                destinationIssPageValue: issPageValues.REVIEW_PAGE
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.ORDER_CONFIRMATION
-            }
-        ]
-    },
-    {
-        issPageValue: issPageValues.TPA_CONFIRMATION,
-        maps: [
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD,
-                destinationIssPageValue: issPageValues.WELCOME_PAGE
-            }
-        ]
-    },
 
+const routingTable = function () {
+    return [
+        {
+            issPageValue: issPageValues.VEHICLE_SELECTION,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.VEHICLE_DAMAGE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.VEHICLE_SELECTION
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_REPAIR,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITHOUT_VIN,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.VEHICLE_LOOKUP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_MANUAL_VIN,
+                    destinationIssPageValue: issPageValues.VIN_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_LICENSE_PLATE,
+                    destinationIssPageValue: issPageValues.LICENSE_PLATE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
+                    destinationIssPageValue: issPageValues.ADDRESS_LOOKUP
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.VIN_LOOKUP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_BAILOUT,
+                    destinationIssPageValue: issPageValues.BAILOUT_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.LICENSE_PLATE_LOOKUP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.PART_QUESTIONS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VIN_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.VEHICLE_PARTS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.REVEAL
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VIN_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.MOLDING_QUESTIONS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VIN_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.CAPABILITY_QUESTIONS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VIN_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.ADDRESS_LOOKUP,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_VEHICLES,
+                    destinationIssPageValue: issPageValues.ADDRESS_VEHICLES
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.ADDRESS_VEHICLES,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.ADDRESS_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.ENTRY_PAGE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.ENTRY_PAGE
+                },
+                {
+                    scenario: navigationScenarios.MOVE_FORWARD_ENTRY_PAGE,
+                    destinationIssPageValue: issPageValues.WELCOME_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.WELCOME_PAGE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.WELCOME_PAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_POLICY_UNVERIFIED,
+                    destinationIssPageValue: issPageValues.POLICY_HOLDER_DETAILS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED_NO_VEHICLES,
+                    destinationIssPageValue: issPageValues.VEHICLE_SELECTION
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED_WITH_VEHICLES,
+                    destinationIssPageValue: issPageValues.POLICY_VEHICLES
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.POLICY_HOLDER_DETAILS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.WELCOME_PAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_POLICY_UNVERIFIED,
+                    destinationIssPageValue: issPageValues.VEHICLE_SELECTION
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_POLICY_VERIFIED,
+                    destinationIssPageValue: issPageValues.POLICY_VEHICLES
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.POLICY_VEHICLES,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.WELCOME_PAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_LISTED_VEHICLE,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_NON_LISTED_VEHICLE,
+                    destinationIssPageValue: issPageValues.VEHICLE_SELECTION
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_BAILOUT,
+                    destinationIssPageValue: issPageValues.BAILOUT_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.COVERAGE_STATEMENT,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VIN_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationIssPageValue: issPageValues.VEHICLE_LOOKUP
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationIssPageValue: issPageValues.PART_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationIssPageValue: issPageValues.VEHICLE_PARTS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationIssPageValue: issPageValues.MOLDING_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
+                    destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_REPAIR,
+                    destinationIssPageValue: issPageValues.VEHICLE_DAMAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SAFELITE,
+                    destinationIssPageValue: issPageValues.SERVICE_LOCATION
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_ENABLED,
+                    destinationIssPageValue: issPageValues.TPA_SEARCH
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_DISABLED,
+                    destinationIssPageValue: issPageValues.BAILOUT_PAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_INVALID_STATE,
+                    destinationIssPageValue: issPageValues.BAILOUT_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.PROVIDER_PREFERENCE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.COVERAGE_STATEMENT
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_SAFELITE,
+                    destinationIssPageValue: issPageValues.SERVICE_LOCATION
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_ENABLED,
+                    destinationIssPageValue: issPageValues.TPA_SEARCH
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_DISABLED,
+                    destinationIssPageValue: issPageValues.BAILOUT_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.SERVICE_LOCATION,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.SCHEDULE_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.SCHEDULE_PAGE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.SERVICE_LOCATION
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.CONTACT_DETAILS
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.CONTACT_DETAILS,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.SCHEDULE_PAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.SERVICE_PACKAGES
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.SERVICE_PACKAGES,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.CONTACT_DETAILS
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.REVIEW_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.REVIEW_PAGE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.SERVICE_PACKAGES
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.PAYMENT_PAGE
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.PAYMENT_PAGE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationIssPageValue: issPageValues.REVIEW_PAGE
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.ORDER_CONFIRMATION
+                }
+            ]
+        },
+        {
+            issPageValue: issPageValues.TPA_CONFIRMATION,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationIssPageValue: issPageValues.WELCOME_PAGE
+                }
+            ]
+        },
     {
         issPageValue: issPageValues.TPA_SUBMIT,
         maps: [
diff --git a/src/store/index.js b/src/store/index.js
index dcb0dfcf..5b0f9f15 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -13,162 +13,146 @@ import { coverageStatuses } from '@/constants/coverage-statuses';
 
 const storeId = 'main';
 
-const getDefaultState = () =>
-    ({
-        order: {
-            vehicle: {
-                year: null,
-                make: null,
-                model: null,
-                style: null,
-                carId: null,
-                category: null,
-                vin: null,
-                imageUrl: null,
-                imageVifNumber: null,
-                imageColor: null,
-                registration: {
-                    licensePlate: null,
-                    address: null,
-                    city: null,
-                    state: null,
-                    zipCode: null,
-                    firstName: null,
-                    lastName: null
-                }
-            },
-            damage: {
-                isRepair: null,
-                numberOfChips: null,
-                glassToReplace: null,
-                partQuestionAnswers: null,
-                moldingQuestionAnswers: null,
-                capabilityQuestionAnswers: null
-            },
-            policy: {
-                policyNumber: null,
-                policyZipCode: null,
-                dateOfLoss: null,
-                damageCause: null,
-                damageState: null,
-                damageCity: null,
-                isDamageGlassOnly: null,
-                policyLookupSuccessful: null,
-                noCoverage: null,
-                deductible: {
-                    repair: null, // numerical value; how much customer owes on deductible in repair case
-                    replace: null // numerical value; how much customer owes on deductible in replace case,
-                }
-            },
-            customer: {
-                address: {
-                    streetAddress: null,
-                    streetAddress2: null,
-                    city: null,
-                    state: null,
-                    zipCode: null
-                },
-                firstName: null,
-                lastName: null,
-                emailAddress: null,
-                phoneNumber: null
-            },
-            serviceLocation: {
+const getDefaultState = () => ({
+    order: {
+        vehicle: {
+            year: null,
+            make: null,
+            model: null,
+            style: null,
+            carId: null,
+            category: null,
+            vin: null,
+            imageUrl: null,
+            imageVifNumber: null,
+            imageColor: null,
+            registration: {
+                licensePlate: null,
                 address: null,
                 city: null,
                 state: null,
                 zipCode: null,
-                zipCodeCtu: null
-            },
-            lineItems: {
-                glassParts: null,
-                otherParts: null,
-                supportingItems: null,
-                vaps: null
-            },
-            payment: {
-                isInsurance: true,
-                insuranceCoverage: {
-                    isVerified: false,
-                    coverageStatus: coverageStatuses.PENDING
-                }
-            },
-            referralNumber: null,
-            referralDate: null,
-            contactInfo: {
                 firstName: null,
-                lastName: null,
-                emailAddress: null,
-                phoneNumber: null,
-                requestTextUpdates: false,
-                notesForTechnician: ''
+                lastName: null
             }
         },
-        applicationUser: {
-            experiments: [],
-            eventBus: [],
-            pageData: {},
-            savedSessionTimeout: getDateForSavedSessionTimeout(),
-            saveSessionPromise: null,
-            savedSessionId: null,
-            crmCustomerId: null,
-            lastPageVisited: null,
-            triggeredSiteEntry: false
+        damage: {
+            isRepair: null,
+            numberOfChips: null,
+            glassToReplace: null,
+            partQuestionAnswers: null,
+            moldingQuestionAnswers: null,
+            capabilityQuestionAnswers: null
         },
-        issConfig: {
-            clientName: 'Generic Insurance', // this is the default and will be overriden by the client's name
-            clientDisplayName: 'Generic Insurance', // this is the default and will be overridden by the client's name or client display name.
-            styleSheet: '', // Stylesheet used by the client.
-            accountNumber: 0, // Account number used by the client.
-            isCoverageEnabled: false, // Indicates if we should be calling coverage on this flow.
-            isClaimRegistrationRequired: false, // Indicates if the claim registration call needs to be made for a client to complete coverage verification.
-            isAuthenticated: false, // Indicates if user is authenticated or not.
-            enableTPAFlow: false, // Indicates if the TPA flow is supported for this client.
-            successReturnURL: null, // Client URL to return the user to upon a successfull flow completetion (order submission).
-            failureReturnURL: null, // Client URL to return the user to when they encounter an error or bailout and are unable to complete the flow.
-            disabledFields: { // Fields that are disabled and read only if sent over from a client.
-                policyNumber: null,
-                policyZipCode: null
+        policy: {
+            policyNumber: null,
+            policyZipCode: null,
+            dateOfLoss: null,
+            damageCause: null,
+            damageState: null,
+            damageCity: null,
+            isDamageGlassOnly: null,
+            policyLookupSuccessful: null,
+            noCoverage: null,
+            deductible: {
+                repair: null, // numerical value; how much customer owes on deductible in repair case
+                replace: null // numerical value; how much customer owes on deductible in replace case,
             }
+        },
+        customer: {
+            address: {
+                streetAddress: null,
+                streetAddress2: null,
+                city: null,
+                state: null,
+                zipCode: null
+            },
+            firstName: null,
+            lastName: null,
+            emailAddress: null,
+            phoneNumber: null
+        },
+        serviceLocation: {
+            address: null,
+            city: null,
+            state: null,
+            zipCode: null,
+            zipCodeCtu: null
+        },
+        lineItems: {
+            glassParts: null,
+            otherParts: null,
+            supportingItems: null,
+            vaps: null
+        },
+        payment: {
+            isInsurance: true,
+            insuranceCoverage: {
+                isVerified: false,
+                coverageStatus: coverageStatuses.PENDING
+            }
+        },
+        referralNumber: null,
+        referralDate: null,
+        contactInfo: {
+            firstName: null,
+            lastName: null,
+            emailAddress: null,
+            phoneNumber: null,
+            requestTextUpdates: false,
+            notesForTechnician: ''
         }
-    });
+    },
+    applicationUser: {
+        experiments: [],
+        eventBus: [],
+        pageData: {},
+        savedSessionTimeout: getDateForSavedSessionTimeout(),
+        saveSessionPromise: null,
+        savedSessionId: null,
+        crmCustomerId: null,
+        lastPageVisited: null,
+        triggeredSiteEntry: false
+    },
+    issConfig: {
+        clientName: 'Generic Insurance', // this is the default and will be overriden by the client's name
+        clientDisplayName: 'Generic Insurance', // this is the default and will be overridden by the client's name or client display name.
+        styleSheet: '', // Stylesheet used by the client.
+        accountNumber: 0, // Account number used by the client.
+        isCoverageEnabled: false, // Indicates if we should be calling coverage on this flow.
+        isClaimRegistrationRequired: false, // Indicates if the claim registration call needs to be made for a client to complete coverage verification.
+        isAuthenticated: false, // Indicates if user is authenticated or not.
+        enableTPAFlow: false, // Indicates if the TPA flow is supported for this client.
+        successReturnURL: null, // Client URL to return the user to upon a successfull flow completetion (order submission).
+        failureReturnURL: null, // Client URL to return the user to when they encounter an error or bailout and are unable to complete the flow.
+        disabledFields: { // Fields that are disabled and read only if sent over from a client.
+            policyNumber: null,
+            policyZipCode: null
+        }
+    }
+});
 
 export const state = getDefaultState();
 
 export const useMainStore = defineStore({
     id: storeId,
-    state: () =>
-        state,
+    state: () => state,
     getters: {
-        hasRecalibrationPart: (state) =>
-            getHasRecalibrationPart(state),
-        vehicle: (state) =>
-            state.order.vehicle,
-        damage: (state) =>
-            state.order.damage,
-        lineItems: (state) =>
-            state.order.lineItems,
-        payment: (state) =>
-            state.order.payment,
-        policy: (state) =>
-            state.order.policy,
-        hasAnyNonWindshieldGlassParts: (state) =>
-            !state.order.policy.isDamageGlassOnly,
-        isClaimRegistrationRequired: (state) =>
-            state.issConfig.isClaimRegistrationRequired,
-        eventBusItem: (state) =>
-            (eventCategory, eventSubCategory) => {
-                const matchedEvent = state.applicationUser.eventBus.find(({ category, subCategory }) =>
-                    category === eventCategory && subCategory === eventSubCategory);
-                return matchedEvent?.eventValue;
-            },
-        eventBus: (state) =>
-            state.applicationUser.eventBus,
-        applicationUserObj: (state) =>
-            state.applicationUser,
-        pageData: (state) =>
-            (page) =>
-                state.applicationUser.pageData[page],
+        hasRecalibrationPart: (state) => getHasRecalibrationPart(state),
+        vehicle: (state) => state.order.vehicle,
+        damage: (state) => state.order.damage,
+        lineItems: (state) => state.order.lineItems,
+        payment: (state) => state.order.payment,
+        policy: (state) => state.order.policy,
+        hasAnyNonWindshieldGlassParts: (state) => !state.order.policy.isDamageGlassOnly,
+        isClaimRegistrationRequired: (state) => state.issConfig.isClaimRegistrationRequired,
+        eventBusItem: (state) => (eventCategory, eventSubCategory) => {
+            const matchedEvent = state.applicationUser.eventBus.find(({ category, subCategory }) => category === eventCategory && subCategory === eventSubCategory);
+            return matchedEvent?.eventValue;
+        },
+        eventBus: (state) => state.applicationUser.eventBus,
+        applicationUserObj: (state) => state.applicationUser,
+        pageData: (state) => (page) => state.applicationUser.pageData[page],
         customerData: (state) => {
             if (state.order.vehicle.registration.address) {
                 const { registration } = state.order.vehicle;
@@ -196,59 +180,54 @@ export const useMainStore = defineStore({
                 lastName: state.order.customer.lastName
             };
         },
-        contactInfo: (s) =>
-            ({
-                firstName: s.order.contactInfo.firstName ?? s.order.customer.firstName,
-                lastName: s.order.contactInfo.lastName ?? s.order.customer.lastName,
-                emailAddress: s.order.contactInfo.emailAddress ?? s.order.customer.emailAddress,
-                phoneNumber: s.order.contactInfo.phoneNumber ?? s.order.customer.phoneNumber,
-                requestTextUpdates: s.order.contactInfo.requestTextUpdates ?? false,
-                notesForTechnician: s.order.contactInfo.notesForTechnician
-            }),
-        experimentOrder: (state) =>
-            ({
-                issVehicleYear: state.order.vehicle.year,
-                issVehicleMake: state.order.vehicle.make,
-                issVehicleModel: state.order.vehicle.model,
-                issVehicleStyle: state.order.vehicle.style,
-                issIsRepair: state.order.damage.isRepair,
-                issNumberOfChips: state.order.damage.numberOfChips,
-                issCarId: state.order.vehicle.carId,
-                issServiceCity: state.order.serviceLocation.city,
-                issServiceState: state.order.serviceLocation.state,
-                issServiceZipCode: state.order.serviceLocation.zipCode,
-                issParentAccountNumber: state.order.accountNumber,
-                issIsCoverageVerified: state.order.payment.insuranceCoverage.isVerified,
-                issHasRecalibrationPart: getHasRecalibrationPart(state),
-                issSelectedMultiGlass: state.order.damage.glassToReplace?.length > 1,
-                issSelectedWindshieldGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
-                    'glassLocation').includes(damageLocationsSelected.WINDSHIELD),
-                issSelectedBackGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
-                    'glassLocation').includes(damageLocationsSelected.REAR),
-                issSelectedDriverSideGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
-                    'glassLocation').includes(damageLocationsSelected.DRIVER),
-                issSelectedPassengerSideGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
-                    'glassLocation').includes(damageLocationsSelected.PASSENGER),
-                issOrderPartNumbers: [
-                    ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.glassParts,
-                        'partNumber'),
-                    ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.otherParts,
-                        'partNumber')
-                ],
+        contactInfo: (s) => ({
+            firstName: s.order.contactInfo.firstName ?? s.order.customer.firstName,
+            lastName: s.order.contactInfo.lastName ?? s.order.customer.lastName,
+            emailAddress: s.order.contactInfo.emailAddress ?? s.order.customer.emailAddress,
+            phoneNumber: s.order.contactInfo.phoneNumber ?? s.order.customer.phoneNumber,
+            requestTextUpdates: s.order.contactInfo.requestTextUpdates ?? false,
+            notesForTechnician: s.order.contactInfo.notesForTechnician
+        }),
+        experimentOrder: (state) => ({
+            issVehicleYear: state.order.vehicle.year,
+            issVehicleMake: state.order.vehicle.make,
+            issVehicleModel: state.order.vehicle.model,
+            issVehicleStyle: state.order.vehicle.style,
+            issIsRepair: state.order.damage.isRepair,
+            issNumberOfChips: state.order.damage.numberOfChips,
+            issCarId: state.order.vehicle.carId,
+            issServiceCity: state.order.serviceLocation.city,
+            issServiceState: state.order.serviceLocation.state,
+            issServiceZipCode: state.order.serviceLocation.zipCode,
+            issParentAccountNumber: state.order.accountNumber,
+            issIsCoverageVerified: state.order.payment.insuranceCoverage.isVerified,
+            issHasRecalibrationPart: getHasRecalibrationPart(state),
+            issSelectedMultiGlass: state.order.damage.glassToReplace?.length > 1,
+            issSelectedWindshieldGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
+                'glassLocation').includes(damageLocationsSelected.WINDSHIELD),
+            issSelectedBackGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
+                'glassLocation').includes(damageLocationsSelected.REAR),
+            issSelectedDriverSideGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
+                'glassLocation').includes(damageLocationsSelected.DRIVER),
+            issSelectedPassengerSideGlass: getNonFalseValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace,
+                'glassLocation').includes(damageLocationsSelected.PASSENGER),
+            issOrderPartNumbers: [
+                ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.glassParts,
+                    'partNumber'),
+                ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.otherParts,
+                    'partNumber')
+            ],
 
-                issOrderPartTypes: [
-                    ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.glassParts,
-                        'recalibrationType'),
-                    ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.otherParts,
-                        'recalibrationType')
-                ]
-            }),
-        experimentSettings: (state) =>
-            state.applicationUser.experiments
-                .map((x) =>
-                    x.settings)
-                .reduce((r, c) =>
-                    Object.assign(r, c), {}) ?? {}
+            issOrderPartTypes: [
+                ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.glassParts,
+                    'recalibrationType'),
+                ...getNonFalseValuesOfPropertyInArrayOfObjects(state.order.lineItems.otherParts,
+                    'recalibrationType')
+            ]
+        }),
+        experimentSettings: (state) => state.applicationUser.experiments
+            .map((x) => x.settings)
+            .reduce((r, c) => Object.assign(r, c), {}) ?? {}
     },
     actions:
     {
@@ -363,7 +342,7 @@ export const useMainStore = defineStore({
                         correlationId: placeHolderCorrelationId
                     }
                 }).then((r) => {
-                    const responsePolicy = response.policies?.[0];
+                    const responsePolicy = r.data.policies?.[0];
                     policy.policyLookupSuccessful = !!responsePolicy;
                     return r;
                 });
@@ -381,71 +360,75 @@ export const useMainStore = defineStore({
         // TODO: replace place holder correlationId with the real thing
             const placeHolderCorrelationId = '00000000-0000-0000-0000-000000000000';
             const nonNumberCharRegex = /[^0-9]/g;
-            const order = this.order;
-            globalMethods.callHttpClient({
-                method: endpoints.RegisterClaim.method,
-                endpoint: endpoints.RegisterClaim.url,
-                payload:
-                {
-                    correlationId: placeHolderCorrelationId,
-                    accountNumber: this.issConfig.accountNumber?.toString() ?? '',
-                    insured: {
-                        firstName: this.order.customer.firstName,
-                        lastName: this.order.customer.lastName,
-                        address: {
-                            addressLine1: this.order.customer.address.streetAddress,
-                            addressLine2: this.order.customer.address.streetAddress2,
-                            city: this.order.customer.address.city,
-                            state: this.order.customer.address.state,
-                            zipCode: this.order.customer.address.zipCode,
-                            country: 'US' // TODO set from store
+            const { order } = this;
+            return new Promise((resolve, reject) => {
+                globalMethods.callHttpClient({
+                    method: endpoints.RegisterClaim.method,
+                    endpoint: endpoints.RegisterClaim.url,
+                    payload:
+                    {
+                        correlationId: placeHolderCorrelationId,
+                        accountNumber: this.issConfig.accountNumber?.toString() ?? '',
+                        insured: {
+                            firstName: this.order.customer.firstName,
+                            lastName: this.order.customer.lastName,
+                            address: {
+                                addressLine1: this.order.customer.address.streetAddress,
+                                addressLine2: this.order.customer.address.streetAddress2,
+                                city: this.order.customer.address.city,
+                                state: this.order.customer.address.state,
+                                zipCode: this.order.customer.address.zipCode,
+                                country: 'US' // TODO set from store
+                            },
+                            homePhone: {
+                                number: this.order.customer.phoneNumber?.replaceAll(nonNumberCharRegex, '') ?? ''
+                            }
                         },
-                        homePhone: {
-                            number: this.order.customer.phoneNumber?.replaceAll(nonNumberCharRegex, '') ?? ''
+                        driver: {
+                            firstName: this.order.customer.firstName,
+                            lastName: this.order.customer.lastName
+                        },
+                        caller: {
+                            homePhone: {}
+                        },
+                        policyInfo: {
+                            policyNumber: this.order.policy.policyNumber,
+                            safelitePolicy: {
+                                policies: []
+                            }
+                        },
+                        lossInfo: {
+                            dateOfLoss: this.order.policy.dateOfLoss,
+                            location: {
+                                city: this.order.policy.damageCity,
+                                state: this.order.policy.damageState,
+                                country: 'US' // TODO set from store
+                            },
+                            vehicle: {
+                                year: this.order.vehicle.year?.toString() ?? '',
+                                make: this.order.vehicle.make,
+                                model: this.order.vehicle.model,
+                                vin: this.order.vehicle.vin
+                            },
+                            damageDescription: this.order.policy.damageCause
                         }
-                    },
-                    driver: {
-                        firstName: this.order.customer.firstName,
-                        lastName: this.order.customer.lastName
-                    },
-                    caller: {
-                        homePhone: {}
-                    },
-                    policyInfo: {
-                        policyNumber: this.order.policy.policyNumber,
-                        safelitePolicy: {
-                            policies: []
-                        }
-                    },
-                    lossInfo: {
-                        dateOfLoss: this.order.policy.dateOfLoss,
-                        location: {
-                            city: this.order.policy.damageCity,
-                            state: this.order.policy.damageState,
-                            country: 'US' // TODO set from store
-                        },
-                        vehicle: {
-                            year: this.order.vehicle.year?.toString() ?? '',
-                            make: this.order.vehicle.make,
-                            model: this.order.vehicle.model,
-                            vin: this.order.vehicle.vin
-                        },
-                        damageDescription: this.order.policy.damageCause
                     }
-                }
-            }).then((response) => {
-                const registerClaimFailed = response.data.isError;
-                order.payment.insuranceCoverage.isVerified = !registerClaimFailed;
-                if (registerClaimFailed) {
+                }).then((response) => {
+                    const registerClaimFailed = response.data.isError;
+                    order.payment.insuranceCoverage.isVerified = !registerClaimFailed;
+                    if (registerClaimFailed) {
+                        this.order.payment.insuranceCoverage.coverageStatus = coverageStatuses.PENDING;
+                    } else if (this.policy.noCoverage) {
+                        this.order.payment.insuranceCoverage.coverageStatus = coverageStatuses.NO_COMP;
+                    } else {
+                        this.order.payment.insuranceCoverage.coverageStatus = coverageStatuses.VERIFIED;
+                    }
+                    return resolve(response);
+                }, (error) => {
+                    this.order.payment.insuranceCoverage.isVerified = false;
                     this.order.payment.insuranceCoverage.coverageStatus = coverageStatuses.PENDING;
-                } else if (this.policy.noCoverage) {
-                    this.order.payment.insuranceCoverage.coverageStatus = coverageStatuses.NO_COMP;
-                } else {
-                    this.order.payment.insuranceCoverage.coverageStatus = coverageStatuses.VERIFIED;
-                }
-            }, (error) => {
-                this.order.payment.insuranceCoverage.isVerified = false;
-                this.order.payment.insuranceCoverage.coverageStatus = coverageStatuses.PENDING;
+                    return reject(error);
+                });
             });
         },
         async lookupVinByPlate(licensePlate, licenseState) {
@@ -545,12 +528,10 @@ export const useMainStore = defineStore({
         getPartFromCapabilityQuestionAnswer(glassLocation) {
             const pageData = this.pageData(issPageValues.CAPABILITY_QUESTIONS);
 
-            const part = pageData.partsOrQuestions.find((x) =>
-                x.glassLocation === glassLocation)
+            const part = pageData.partsOrQuestions.find((x) => x.glassLocation === glassLocation)
                 .parts[0];
             const { capabilityQuestionAnswers } = this.order.damage;
-            const capabilityQuestionAnswersForPart = capabilityQuestionAnswers.find((x) =>
-                x.glassLocation === glassLocation);
+            const capabilityQuestionAnswersForPart = capabilityQuestionAnswers.find((x) => x.glassLocation === glassLocation);
 
             return globalMethods.callHttpClient({
                 method: endpoints.GetPartFromCapabilityAnswer.method,
@@ -650,10 +631,9 @@ export const useMainStore = defineStore({
         },
 
         getServiceabilityDetails({ serviceZipCode }) {
-            const lineItemsWithOnlyPartNumbers = this.order.lineItems.glassParts.map((glassPart) =>
-                ({
-                    partNumber: glassPart.partNumber
-                }));
+            const lineItemsWithOnlyPartNumbers = this.order.lineItems.glassParts.map((glassPart) => ({
+                partNumber: glassPart.partNumber
+            }));
             const lineItems = buildQueryStringParameterFromArrayOfComplexObjects(lineItemsWithOnlyPartNumbers,
                 'lineItems');
 
@@ -701,8 +681,7 @@ export const useMainStore = defineStore({
             && this.order.damage.glassToReplace
                 .slice()
                 .sort()
-                .every((obj, index) =>
-                    obj.glassLocation === selectedGlassPassedInSorted[index].glassLocation
+                .every((obj, index) => obj.glassLocation === selectedGlassPassedInSorted[index].glassLocation
                         && obj.glassName === selectedGlassPassedInSorted[index].glassName);
             const isWindshieldRepairTheSame
             = isWindshieldRepair === this.order.damage.isRepair;
@@ -951,8 +930,7 @@ export const useMainStore = defineStore({
                 'result');
             const havePartQuestionAnswersChanged
             = sortedPreviousResultsArray?.length !== sortedPartQuestionAnswersArray.length
-            || !sortedPreviousResultsArray?.every((x, i) =>
-                x.result === sortedPartQuestionAnswersArray[i].result);
+            || !sortedPreviousResultsArray?.every((x, i) => x.result === sortedPartQuestionAnswersArray[i].result);
 
             if (havePartQuestionAnswersChanged) {
                 this.updateGlassParts(null);
@@ -976,8 +954,7 @@ export const useMainStore = defineStore({
                 'result');
             const haveMoldingQuestionAnswersChanged
           = sortedPreviousResultsArray?.length !== sortedMoldingQuestionAnswersArray.length
-          || !sortedPreviousResultsArray?.every((x, i) =>
-              x.result === sortedMoldingQuestionAnswersArray[i].result);
+          || !sortedPreviousResultsArray?.every((x, i) => x.result === sortedMoldingQuestionAnswersArray[i].result);
 
             if (haveMoldingQuestionAnswersChanged) {
                 this.updateGlassParts(null);
@@ -997,8 +974,7 @@ export const useMainStore = defineStore({
                 'result');
             const haveCapabilityQuestionAnswersChanged
           = sortedPreviousResultsArray?.length !== sortedCapabilityQuestionAnswersArray.length
-          || !sortedPreviousResultsArray?.every((x, i) =>
-              x.result === sortedCapabilityQuestionAnswersArray[i].result);
+          || !sortedPreviousResultsArray?.every((x, i) => x.result === sortedCapabilityQuestionAnswersArray[i].result);
 
             if (haveCapabilityQuestionAnswersChanged) {
                 this.updateGlassParts(null);
@@ -1024,8 +1000,7 @@ export const useMainStore = defineStore({
             this.applicationUser.eventBus.push(event);
         },
         removeEventFromBus(eventData) {
-            const matchedEvent = this.applicationUser.eventBus.find(({ category, subCategory }) =>
-                category === eventData.category && subCategory === eventData.subCategory);
+            const matchedEvent = this.applicationUser.eventBus.find(({ category, subCategory }) => category === eventData.category && subCategory === eventData.subCategory);
             const itemIndex = this.applicationUser.eventBus.indexOf(matchedEvent);
 
             // If the item exists, remove it.
@@ -1083,11 +1058,10 @@ export const useMainStore = defineStore({
                 endpoint: endpoints.LogPageView.url,
                 payload,
                 logApiCall: false
-            }).then((response) =>
-                response,
-            (error) => {
-                console.log(`Analytics Service Error: ${error.data}`);
-            });
+            }).then((response) => response,
+                (error) => {
+                    console.log(`Analytics Service Error: ${error.data}`);
+                });
         },
         logCustomEvent({ userId, sessionKey, pageName, sessionId, category, action, label, value, shouldUseSessionId, experimentsForUser }) {
             if (pageName == null || pageName.length === 0) { pageName = 'none'; }
@@ -1111,11 +1085,10 @@ export const useMainStore = defineStore({
                 endpoint: endpoints.LogCustomEvent.url,
                 payload,
                 logApiCall: false
-            }).then((response) =>
-                response,
-            (error) => {
-                console.log(`Analytics Service Error: ${error.data}`);
-            });
+            }).then((response) => response,
+                (error) => {
+                    console.log(`Analytics Service Error: ${error.data}`);
+                });
         },
         initializeSession({ userId, sessionId, userAgent, referrer }) {
             const payload = {
@@ -1134,11 +1107,10 @@ export const useMainStore = defineStore({
                 endpoint: endpoints.InitializeSession.url,
                 payload,
                 logApiCall: false
-            }).then((response) =>
-                response,
-            (error) => {
-                console.log(`Analytics Service Error: ${error.data}`);
-            });
+            }).then((response) => response,
+                (error) => {
+                    console.log(`Analytics Service Error: ${error.data}`);
+                });
         },
 
         updateLastPageVisited(lastPageVisited) {
@@ -1335,9 +1307,7 @@ function getHasRecalibrationPart(state) {
 }
 
 function getNonFalseValuesOfPropertyInArrayOfObjects(array, propertyName) {
-    return (array ?? []).map((x) =>
-        x[propertyName]).filter((x) =>
-        x);
+    return (array ?? []).map((x) => x[propertyName]).filter((x) => x);
 }
 
 function sortArrayOfObjectsByPropertyValue(arrayOfObjects, propertyName) {
@@ -1397,8 +1367,7 @@ function addPricesToLineItems(lineItems, pricingLineItems) {
             addPricesToLineItems(lineItem.childParts, pricingLineItems);
         }
 
-        const lineItemIndex = pricingLineItems.findIndex((pricingLineItem) =>
-            pricingLineItem.partNumber === lineItem.partNumber);
+        const lineItemIndex = pricingLineItems.findIndex((pricingLineItem) => pricingLineItem.partNumber === lineItem.partNumber);
 
         if (lineItemIndex > -1) {
             const pricedLineItem = pricingLineItems[lineItemIndex];
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index aa4a6b5d..369d387e 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -405,10 +405,14 @@ describe('Store', () => {
 
         it('Call to client returns exception, resulting in object with error property being returned', async () => {
             // Arrange
-            globalMethods.callHttpClient = jest.fn().mockReturnValue(Promise.reject());
+            expect.assertions(4);
+            const error = 'this is the error';
+            globalMethods.callHttpClient = jest.fn().mockReturnValue(Promise.reject(error));
 
             // Act
-            await store.registerClaim();
+            await store.registerClaim().catch((e) => {
+                expect(e).toEqual(error);
+            });
 
             // Asserts
             expect(globalMethods.callHttpClient).toHaveBeenCalled();
diff --git a/src/styles/client-customizations.scss b/src/styles/client-customizations.scss
index 5e0db1ec..e1955587 100644
--- a/src/styles/client-customizations.scss
+++ b/src/styles/client-customizations.scss
@@ -22,6 +22,10 @@ $limu-button-color: #A9E3E9;
         color: $limu-link !important;
     }
 
+    .modal-text {
+        color: $limu-link !important;
+    }
+
     .btn {
         &.btn-override[aria-disabled="false"]{
             &.btn-primary {
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 82aef9b5..c092d62b 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -68,6 +68,9 @@ body {
         display: inline;
         color: $blue;
         cursor: pointer;
-        text-decoration: underline;
+        border: none;
+        font-size: 14px;
+        line-height: 24px;
+        font-weight: 500;
       }
 }