diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index 4f4214120..07632f5e5 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -24,14 +24,13 @@ export function getMountOptions(mockData) {
   mocks.logEvent = jest.fn();
   mocks.pushExperimentsToDataLayer = jest.fn();
   mocks.prependActionToMethod = jest.fn();
-
   mocks.dispatchStoreAction = jest.fn();
   mocks.dispatchStoreAction.mockImplementation((actionName) => {
     let actionFilterResult = mockData.actionList.filter(
       (x) => x.actionName == actionName
     );
 
-    if (actionFilterResult.length > 0 && actionFilterResult.length === 1) {
+    if (actionFilterResult.length === 1) {
       return Promise.resolve({
         data: actionFilterResult[0].data,
       });
diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js
new file mode 100644
index 000000000..885cacf50
--- /dev/null
+++ b/src/layouts/address-lookup/address-lookup.spec.js
@@ -0,0 +1,505 @@
+// Components
+import addressLookup from "@/layouts/address-lookup/address-lookup.vue";
+import funnelHeader from "@/common-components/funnel-header/funnel-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
+import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import router from "@/router";
+
+// Supporting Files
+import { settleAllPromises } from "@/helpers/layout-helper.js";
+import baseMixin from "@/mixins/base-mixin";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { mount, flushPromises, shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { maska } from 'maska';
+import { nextTick } from "vue";
+import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations";
+import store from "@/store";
+import { validate } from "vee-validate";
+import { isGlassAvailableForCarId } from "@/helpers/damage-helper.js"
+import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { EXPECTATION_FAILED } from "http-status-codes";
+
+// Mock our module for promises.
+// jest.mock("@/helpers/layout-helper.js", () => ({
+//     settleAllPromises: jest.fn(),
+// }));
+
+// // Mock fetchCmsContentForPage
+// jest.mock("@/helpers/cms-content-helper", () => ({
+//     fetchCmsContentForPage: jest.fn(),
+// }));
+
+jest.mock("@/helpers/damage-helper", () => ({
+  isGlassAvailableForCarId: jest.fn().mockImplementation(() => true),
+  getDamageString: jest.fn()
+}));
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+  navigateAfterSaveToHeritageFunnel: jest.fn()
+}));
+
+
+// const questionText = "Question Text";
+// const mockMixin = {
+//   methods: {
+//     getCmsContent: jest.fn().mockImplementation(() => {
+//       return questionText;
+//     })
+//   }
+// }
+
+describe("address-lookup.vue", () => {
+  describe("registration and service zips", () => {
+    describe("if registration zip is serviceable", () => {
+      test("if registration address is provided => update service address on successful continue", async () => {
+        // Arrange
+        const mockRegistrationAddress = {
+          streetAddress: "1234 Main St",
+          city: "Columbus",
+          state: "OH",
+          zipCode: "43215"
+        }
+
+        const { wrapper } = setupMocks(addressLookup,{
+          isZipServiceable: true
+        });
+
+        store.commit(storeMutations.UPDATE_CAR_ID, "CARID");
+
+        await wrapper.setData({
+          customerQuestions: {
+            addressQuestions: mockRegistrationAddress
+          }
+        })
+
+        // Act
+        await wrapper.vm.forwardButtonAction();
+
+        // Assert 
+        expect(baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(storeActions.UPDATE_SERVICE_LOCATION_WITH_VEHICLE_REGISTRATION);
+      });
+    });
+
+    describe("if registration zip is not serviceable", () => {
+      test("if registration address is provided and user clicks continue => show non-serviceable zip alert", async () => {
+        // Arrange
+        const mockRegistrationAddress = {
+          streetAddress: "1234 Main St",
+          city: "Columbus",
+          state: "OH",
+          zipCode: "43215"
+        }
+
+        const { wrapper } = setupMocks(addressLookup, {
+          isZipServiceable: false
+        });
+
+        store.commit(storeMutations.UPDATE_CAR_ID, "CARID");
+
+        await wrapper.setData({
+          customerQuestions: {
+            addressQuestions: mockRegistrationAddress
+          }
+        })
+
+        expect(wrapper.findComponent({ ref: "alertNonServiceableZip" }).exists()).toBe(false);
+
+        // Act
+        await wrapper.vm.forwardButtonAction();
+
+        // Assert 
+        expect(wrapper.vm.displayNonServiceableZipAlert).toBe(true);
+        expect(wrapper.findComponent({ ref: "alertNonServiceableZip" }).exists()).toBe(true);
+        expect(wrapper.findComponent({ ref: "alertNonServiceableZip" }).isVisible()).toBe(true);
+      });
+
+      test("if registration address is provided user clicks continue => show service zip field on continue click", async () => {
+        // Arrange
+        const mockRegistrationAddress = {
+          streetAddress: "1234 Main St",
+          city: "Columbus",
+          state: "OH",
+          zipCode: "43215"
+        }
+
+        const { wrapper } = setupMocks(addressLookup, {
+            isZipServiceable: false
+          }
+        );
+
+        expect(wrapper.vm.showServiceZipField).toBeFalsy();
+        expect(wrapper.findComponent({ ref: "serviceZip" }).exists()).toBe(false);
+        store.commit(storeMutations.UPDATE_CAR_ID, "CARID");
+
+        await wrapper.setData({
+          customerQuestions: {
+            addressQuestions: mockRegistrationAddress
+          }
+        })
+
+        // Act
+        await wrapper.vm.forwardButtonAction();
+
+        // Assert 
+        expect(wrapper.vm.showServiceZipField).toBe(true);
+        expect(wrapper.findComponent({ ref: "serviceZip" }).isVisible()).toBe(true);
+      });
+
+      test("if registration address, service zip are provided, and user clicks continue => don't update service address", async () => {
+        // Arrange
+        const mockRegistrationAddress = {
+          streetAddress: "1234 Main St",
+          city: "Columbus",
+          state: "OH",
+          zipCode: "43215"
+        }
+
+        const { wrapper } = setupMocks(addressLookup, {
+            isZipServiceable: false
+          }
+        );
+
+        store.commit(storeMutations.UPDATE_CAR_ID, "CARID");
+
+        await wrapper.setData({
+          customerQuestions: {
+            addressQuestions: mockRegistrationAddress
+          }
+        })
+
+        // Act
+        await wrapper.vm.forwardButtonAction();
+
+        // Assert 
+        expect(baseMixin.methods.dispatchStoreAction).not.toHaveBeenCalledWith(storeActions.UPDATE_SERVICE_LOCATION_WITH_VEHICLE_REGISTRATION);
+      });
+
+      test("if registration address, service zip are provided, and user clicks continue => both zips are saved and are different", async () => {
+        // Arrange
+        const mockRegistrationAddress = {
+          streetAddress: "1234 Main St",
+          city: "Columbus",
+          state: "OH",
+          zipCode: "43215"
+        }
+
+        const { wrapper } = setupMocks(addressLookup, {});
+
+        store.commit(storeMutations.UPDATE_CAR_ID, "CARID");
+
+        baseMixin.methods.dispatchStoreAction = jest.fn();
+        baseMixin.methods.dispatchStoreAction.mockImplementation((actionName, value) => {
+          let data = {};
+          if (actionName == storeActions.VALIDATE_ZIP) {
+            if (value == "43215") {
+              data = {
+                isServiceable: false
+              };
+            }
+            else {
+              data = {
+                isServiceable: true
+              }
+            }
+          }
+          else if (actionName == storeActions.LOOKUP_VIN_BY_ADDRESS) {
+            data = {
+              isStatePermissible: true,
+              vinVehicles: [{
+                vin: "TEST_VIN",
+                vehicle: {
+                  carId: "CARID"
+                }
+              }]
+            }
+          }
+
+          return Promise.resolve({ data });
+        })
+
+        await wrapper.setData({
+          customerQuestions: {
+            addressQuestions: mockRegistrationAddress
+          }
+        })
+        await wrapper.vm.forwardButtonAction();
+        await wrapper.setData({
+          serviceZipCode: "12345"
+        })
+
+        // Act
+        await wrapper.vm.forwardButtonAction();
+
+        // Assert 
+        expect(store.getters.order.serviceLocation.zipCode).not.toEqual(store.getters.vehicle.registration.zipCode);
+        expect(store.getters.vehicle.registration.zipCode).toEqual("43215");
+        expect(store.getters.order.serviceLocation.zipCode).toEqual("12345");
+      });
+    });
+  });
+
+  describe.skip("initialization", () => {
+    test("Page header is initialized with api data", async (done) => {
+      //Arrange
+      const pageHeaderWidgetHeaderText = "Select Damage";
+      const { wrapper, apiPromise } = setupMocks({
+        pageHeaderWidgetHeaderText: pageHeaderWidgetHeaderText,
+      });
+
+      //Act
+      addressLookup.beforeRouteEnter.call(
+        wrapper.vm,
+        { query: { fmgPage: "address-lookup" } },
+        undefined,
+        (c) => c(wrapper.vm)
+      );
+
+      //Assert
+      apiPromise.finally(() => {
+        expect(funnelSubHeader.methods.initializeComponent).toHaveBeenCalledWith(
+          pageHeaderWidgetHeaderText
+        );
+        done();
+      });
+    });
+
+    test("Customer Questions component is initialized with api data", async (done) => {
+      //Arrange
+      const StreetAddressQuestionWidget = { QuestionText: "test" };
+      const CityQuestionWidget = { QuestionText: "test" };
+      const StateQuestionWidget = { QuestionText: "test" };
+      const ZipQuestionWidget = { QuestionText: "test" };
+      const FirstNameQuestionWidget = { QuestionText: "test" };
+      const LastNameQuestionWidget = { QuestionText: "test" };
+      const EmailAddressQuestionWidget = { QuestionText: "test" };
+      const AlertVerificationWarningWidget = { HeaderText: "test", BodyText: "test" };
+      const AlertNoMatchWarningWidget = { HeaderText: "test", BodyText: "test" };
+
+      const widgets = [
+        StreetAddressQuestionWidget,
+        CityQuestionWidget,
+        StateQuestionWidget,
+        ZipQuestionWidget,
+        AlertVerificationWarningWidget,
+        AlertNoMatchWarningWidget,
+        FirstNameQuestionWidget,
+        LastNameQuestionWidget,
+        EmailAddressQuestionWidget,
+      ];
+
+      const { wrapper, apiPromise } = setupMocks({
+        cmsContent: widgets,
+      });
+
+      //Act
+      addressLookup.beforeRouteEnter.call(
+        wrapper.vm,
+        { query: { fmgPage: "address-lookup" } },
+        undefined,
+        (c) => c(wrapper.vm)
+      );
+
+      //Assert
+      apiPromise.finally(() => {
+        expect(customerQuestions.methods.initializeComponent).toHaveBeenCalledWith(
+          widgets
+        );
+        done();
+      });
+    });
+  });
+});
+
+function setupMocks(mountOptions, { isZipServiceable = true, lookupVinbyAddressResponse }) {
+  store.commit(storeMutations.RESET_STATE);
+  console.log(isZipServiceable)
+  const wrapper = shallowMount(addressLookup, getMountOptions({
+    ...mountOptions,
+    actionList: [
+      {
+        actionName: storeActions.VALIDATE_ZIP,
+        data: {
+          isServiceable: isZipServiceable
+        }
+      },
+      {
+        actionName: storeActions.LOOKUP_VIN_BY_ADDRESS,
+        data: lookupVinbyAddressResponse ? lookupVinbyAddressResponse : {
+          isStatePermissible: true,
+          vinVehicles: [{
+            vin: "TEST_VIN",
+            vehicle: {
+              carId: "CARID"
+            }
+          }]
+        }
+      }
+    ],
+    router: {
+      navigate: jest.fn(),
+      navigateAfterSave: jest.fn()
+    },
+  }));
+
+  wrapper.vm.getCmsContent = jest.fn().mockImplementation(() => "");
+  wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
+  wrapper.vm.$refs.funnelFooter.updateButtonText = jest.fn();
+  wrapper.vm.$refs.funnelFooter.removeLoader = jest.fn();
+  wrapper.vm.$refs.loadingModal.showModal = jest.fn();
+
+  // jest.mock("@/store", () => ({
+  //   commit: jest.fn(),
+  //   dispatch: jest.fn(),
+  //   getters: {
+  //     vehicle: {
+  //       carId: "CARID"
+  //     }
+  //   },
+  // }));
+
+  return { wrapper };
+}
+
+// function setupMocks({
+//   pageHeaderWidgetHeaderText = {},
+//   mountOptionsMockData = {
+//     router: {
+//       navigate: jest.fn(),
+//     },
+//     store: {
+//       getters: {
+//         vehicle: {},
+//       },
+//     },
+//   },
+// }) {
+//   //Mock api responses
+//   baseMixin.methods.dispatchStoreAction = jest.fn();
+//   const apiResponses = {
+//     cmsContent: {
+//       FunnelSubHeaderWidget: pageHeaderWidgetHeaderText,
+//       VehicleBannerWidget: {
+//         GenericVehicleImage:
+//           "https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/blurred-image.jpg?sfvrsn=a6ce3034_3",
+//       },
+//       FunnelHeaderWidget: {
+//         LogoImage:
+//           "https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/safelite-logo.svg?sfvrsn=45e7ed06_3",
+//       },
+//       StreetAddressQuestionWidget: {
+//         QuestionText:
+//           "test"
+//       },
+//       CityQuestionWidget: {
+//         QuestionText:
+//           "test"
+//       },
+//       StateQuestionWidget: {
+//         QuestionText:
+//           "test"
+//       },
+//       ZipQuestionWidget: {
+//         QuestionText:
+//           "test"
+//       },
+//       FirstNameQuestionWidget: {
+//         QuestionText:
+//           "test"
+//       },
+//       LastNameQuestionWidget: {
+//         QuestionText:
+//           "test"
+//       },
+//       EmailAddressQuestionWidget: {
+//         QuestionText:
+//           "test"
+//       },
+//       AlertVerificationWarningWidget: {
+//         HeaderText:
+//           "test",
+//         BodyText:
+//           "test",
+//       },
+//       AlertNoMatchWarningWidget: {
+//         HeaderText:
+//           "test",
+//         BodyText:
+//           "test",
+//       },
+
+//     },
+//   };
+
+//   const apiPromise = Promise.resolve(apiResponses);
+
+//   settleAllPromises.mockImplementation(() => apiPromise);
+//   fetchCmsContentForPage.mockImplementation(() => Promise.resolve());
+
+//   //Mock damage initialize methods
+//   funnelHeader.methods = {
+//     initializeComponent: jest.fn(),
+//   };
+
+//   vehicleBanner.methods = {
+//     initializeComponent: jest.fn(),
+//   };
+
+//   funnelSubHeader.methods = {
+//     initializeComponent: jest.fn(),
+//   };
+
+//   funnelFooter.methods = {
+//     initializeComponent: jest.fn(),
+//   };
+
+//   customerQuestions.methods = {
+//     initializeComponent: jest.fn(),
+//   };
+
+//   addressQuestions.methods = {
+//     initializeComponent: jest.fn(),
+//     setupAddressLookup: jest.fn(),
+//   };
+
+//   const mountOptions = getMountOptions(mountOptionsMockData);
+//   mountOptions['attachTo'] = document.body; // append wrapper to document.body to test DOM methods
+
+//   mountOptions.global.directives = {
+//     maska: maska
+//   };
+
+//   const wrapper = mount(addressLookup, mountOptions);
+
+//   const funnelHeaderWrapper = wrapper.findComponent({ name: "funnelHeader" });
+//   funnelHeaderWrapper.vm.initializeComponent =
+//     funnelHeader.methods.initializeComponent;
+
+//   const vehicleBannerWrapper = wrapper.findComponent({ name: "vehicleBanner" });
+//   vehicleBannerWrapper.vm.initializeComponent =
+//     vehicleBanner.methods.initializeComponent;
+
+//   const funnelSubHeaderWrapper = wrapper.findComponent({ name: "funnelSubHeader" });
+//   funnelSubHeaderWrapper.vm.initializeComponent =
+//     funnelSubHeader.methods.initializeComponent;
+
+//   const funnelFooterWrapper = wrapper.findComponent({ name: "funnelFooter" });
+//   funnelFooterWrapper.vm.initializeComponent =
+//     funnelFooter.methods.initializeComponent;
+
+//   const customerQuestionsWrapper = wrapper.findComponent({ name: "customerQuestions" });
+//   customerQuestionsWrapper.vm.initializeComponent =
+//     customerQuestions.methods.initializeComponent;
+
+//   const addressQuestionsWrapper = wrapper.findComponent({ name: "addressQuestions" });
+//   addressQuestionsWrapper.vm.initializeComponent =
+//     addressQuestions.methods.initializeComponent;
+//   addressQuestionsWrapper.vm.setupAddressLookup =
+//     addressQuestions.methods.setupAddressLookup;
+
+//   return { wrapper, apiPromise };
+// }
\ No newline at end of file
diff --git a/src/layouts/address-lookup/address-lookup.spec.js1 b/src/layouts/address-lookup/address-lookup.spec.js1
deleted file mode 100644
index 4443100c3..000000000
--- a/src/layouts/address-lookup/address-lookup.spec.js1
+++ /dev/null
@@ -1,244 +0,0 @@
-// Components
-import addressLookup from "@/layouts/address-lookup/address-lookup.vue";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-
-// Supporting Files
-import { settleAllPromises } from "@/helpers/layout-helper.js";
-import baseMixin from "@/mixins/base-mixin";
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { mount, flushPromises } from "@vue/test-utils";
-import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import { maska } from 'maska';
-import { nextTick } from "vue";
-import { storeActions } from "@/constants/store-actions";
-import { storeMutations } from "@/constants/store-mutations";
-import store from "@/store";
-import { validate } from "vee-validate";
-
-// Mock our module for promises.
-jest.mock("@/helpers/layout-helper.js", () => ({
-    settleAllPromises: jest.fn(),
-}));
-  
-// Mock fetchCmsContentForPage
-jest.mock("@/helpers/cms-content-helper", () => ({
-    fetchCmsContentForPage: jest.fn(),
-}));
-
-describe("address-lookup.vue", () => {
-    test("Page header is initialized with api data", async (done) => {
-      //Arrange
-      const pageHeaderWidgetHeaderText = "Select Damage";
-      const { wrapper, apiPromise } = setupMocks({
-        pageHeaderWidgetHeaderText: pageHeaderWidgetHeaderText,
-      });
-  
-      //Act
-      addressLookup.beforeRouteEnter.call(
-        wrapper.vm,
-        { query: { fmgPage: "address-lookup" } },
-        undefined,
-        (c) => c(wrapper.vm)
-      );
-  
-      //Assert
-      apiPromise.finally(() => {
-        expect(funnelSubHeader.methods.initializeComponent).toHaveBeenCalledWith(
-          pageHeaderWidgetHeaderText
-        );        
-        done();
-      });
-    });
-
-    test("Customer Questions component is initialized with api data", async (done) => {
-        //Arrange
-        const StreetAddressQuestionWidget = { QuestionText: "test" };
-        const CityQuestionWidget = { QuestionText: "test" };
-        const StateQuestionWidget = { QuestionText: "test" };
-        const ZipQuestionWidget = { QuestionText: "test" };
-        const FirstNameQuestionWidget = { QuestionText: "test" };
-        const LastNameQuestionWidget = { QuestionText: "test" };
-        const EmailAddressQuestionWidget = { QuestionText: "test" };
-        const AlertVerificationWarningWidget = { HeaderText: "test", BodyText: "test" };
-        const AlertNoMatchWarningWidget = { HeaderText: "test", BodyText: "test" };
-
-        const widgets = [
-            StreetAddressQuestionWidget,
-            CityQuestionWidget,
-            StateQuestionWidget,
-            ZipQuestionWidget,
-            AlertVerificationWarningWidget,
-            AlertNoMatchWarningWidget,
-            FirstNameQuestionWidget,
-            LastNameQuestionWidget,
-            EmailAddressQuestionWidget,
-            ];
-
-        const { wrapper, apiPromise } = setupMocks({
-          cmsContent: widgets,
-        });
-    
-        //Act
-        addressLookup.beforeRouteEnter.call(
-          wrapper.vm,
-          { query: { fmgPage: "address-lookup" } },
-          undefined,
-          (c) => c(wrapper.vm)
-        );
-    
-        //Assert
-        apiPromise.finally(() => {
-          expect(customerQuestions.methods.initializeComponent).toHaveBeenCalledWith(
-            widgets
-          );        
-          done();
-        });
-      });
-
-  });
-
-  
-
-  function setupMocks({
-    pageHeaderWidgetHeaderText = {},
-    mountOptionsMockData = {
-      router: {
-        navigate: jest.fn(),
-      },
-      store: {
-        getters: {
-          vehicle: {},
-        },
-      },
-    },
-  }) {
-    //Mock api responses
-    baseMixin.methods.dispatchStoreAction = jest.fn();
-    const apiResponses = {
-      cmsContent: {
-        FunnelSubHeaderWidget: pageHeaderWidgetHeaderText,
-        VehicleBannerWidget: {
-          GenericVehicleImage:
-            "https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/blurred-image.jpg?sfvrsn=a6ce3034_3",
-        },
-        FunnelHeaderWidget: {
-          LogoImage:
-            "https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/safelite-logo.svg?sfvrsn=45e7ed06_3",
-        },
-        StreetAddressQuestionWidget: {
-            QuestionText: 
-              "test"
-        },
-        CityQuestionWidget: {
-            QuestionText: 
-              "test"
-        },
-        StateQuestionWidget: {
-            QuestionText: 
-              "test"
-        },
-        ZipQuestionWidget: {
-            QuestionText: 
-              "test"
-        },
-        FirstNameQuestionWidget: {
-            QuestionText: 
-              "test"
-        },
-        LastNameQuestionWidget: {
-            QuestionText: 
-              "test"
-        },
-        EmailAddressQuestionWidget: {
-            QuestionText: 
-              "test"
-        },
-        AlertVerificationWarningWidget: {
-            HeaderText: 
-              "test",
-            BodyText:
-              "test",
-        },
-        AlertNoMatchWarningWidget: {
-            HeaderText: 
-              "test",
-            BodyText:
-              "test",
-        },
-
-      },
-    };
-  
-    const apiPromise = Promise.resolve(apiResponses);
-  
-    settleAllPromises.mockImplementation(() => apiPromise);
-    fetchCmsContentForPage.mockImplementation(() => Promise.resolve());
-  
-    //Mock damage initialize methods
-    funnelHeader.methods = {
-      initializeComponent: jest.fn(),
-    };
-  
-    vehicleBanner.methods = {
-      initializeComponent: jest.fn(),
-    };
-  
-    funnelSubHeader.methods = {
-      initializeComponent: jest.fn(),
-    };
-    
-    funnelFooter.methods = {
-      initializeComponent: jest.fn(),
-    };
-
-    customerQuestions.methods = {
-        initializeComponent: jest.fn(),
-    };
-
-    addressQuestions.methods = {
-      initializeComponent: jest.fn(),
-      setupAddressLookup: jest.fn(),
-    };
-
-    const mountOptions = getMountOptions(mountOptionsMockData);
-    mountOptions['attachTo'] = document.body; // append wrapper to document.body to test DOM methods
-
-    mountOptions.global.directives = {
-        maska: maska
-    };
-
-    const wrapper = mount(addressLookup, mountOptions);
-  
-    const funnelHeaderWrapper = wrapper.findComponent({ name: "funnelHeader" });
-    funnelHeaderWrapper.vm.initializeComponent =
-      funnelHeader.methods.initializeComponent;
-  
-    const vehicleBannerWrapper = wrapper.findComponent({ name: "vehicleBanner" });
-    vehicleBannerWrapper.vm.initializeComponent =
-      vehicleBanner.methods.initializeComponent;
-    
-    const funnelSubHeaderWrapper = wrapper.findComponent({ name: "funnelSubHeader" });
-    funnelSubHeaderWrapper.vm.initializeComponent =
-      funnelSubHeader.methods.initializeComponent;
-    
-    const funnelFooterWrapper = wrapper.findComponent({ name: "funnelFooter" });
-    funnelFooterWrapper.vm.initializeComponent = 
-      funnelFooter.methods.initializeComponent;
-
-    const customerQuestionsWrapper = wrapper.findComponent({ name: "customerQuestions" });
-    customerQuestionsWrapper.vm.initializeComponent = 
-      customerQuestions.methods.initializeComponent;       
-
-    const addressQuestionsWrapper = wrapper.findComponent({ name: "addressQuestions" });
-    addressQuestionsWrapper.vm.initializeComponent = 
-      addressQuestions.methods.initializeComponent;  
-    addressQuestionsWrapper.vm.setupAddressLookup = 
-      addressQuestions.methods.setupAddressLookup;
-
-    return { wrapper, apiPromise };
-  }
\ No newline at end of file
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index f29e3d21a..02946177e 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -1,67 +1,101 @@
 <template>
-	<Form
-		@submit="onSubmit"
-		@invalid-submit="onInvalidSubmit"
-		ref="theForm"
-		v-slot="{ meta }"
-		autocomplete="off" >
-		<div class="page-container-grouped-styles">
-			<loadingModal ref="loadingModal"/>
-			<funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-			<vehicleBanner cmsWidgetName="VehicleBannerWidget" ref="vehicleBanner" :displayGenericVehicleImage=false />
-			<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" ref="funnelSubHeader" />	
-			<div class="fade-on-route-transition sub-container make-tall">
-				<customerQuestions ref="customerQuestions" v-model="customerQuestions" />
-				<alert ref="alertVinNotFound" v-if="displayVinNotFoundAlert"
-					class="mb-4"
-					cmsWidgetName="AlertVinNotFoundWidget"
-					alertClass="alert-danger"
-					v-bind:isDismissible="false"
-				/>
-				<alert ref="alertMatchedDifferentVehicle" v-if="displayMatchedDifferentVehicleAlert"
-					class="mb-4"
-					:manualHeadline="AlertMatchedDifferentVehicleHeader"
-					:manualCopy="AlertMatchedDifferentVehicleBody"
-					alertClass="alert-warning"
-					v-bind:isDismissible="false"
-				/>			
-				<alert ref="alertNonServiceableZip" v-if="displayNonServiceableZipAlert"
-					class="mb-4"
-					alertClass="alert-danger"
-					:manualHeadline="AlertNonServiceableZipHeader"
-					:manualCopy="AlertNonServiceableZipBody"
-					v-bind:isDismissible="false"
-				/>			
-				<alert ref="alertVinLookupsByHomeAddressNotAllowed" v-if="displayVinLookupByHomeAddressNotAllowedAlert"
-					class="mb-4"
-					cmsWidgetName="AlertVinLookupsByHomeAddressNotAllowedWidget"
-					alertClass="alert-danger"
-					v-bind:isDismissible="false"
-				/>
-				<transition name="fade" mode="out-in">
-					<div class="service-zip-field" v-if="showServiceZipField" aria-live="polite">
-						<div class="row mb-4">
-							<div class="col">
-								<textboxQuestion cmsWidgetName="ServiceZipQuestionWidget" v-model="serviceZipCode" ref="serviceZip" inputId="7add1b26df344f2caf1678de5797803f" aria-haspopup="" mask="#####" disableAutoFill validationRules="service-zip-required|service-zip-format" />
-							</div>
-						</div>
-					</div>
-				</transition>								
-				<funnel-footer
-					cmsWidgetName="FunnelFooterWidget"
-					ref="funnelFooter"
-					:isDisabled="!meta.valid"
-					@ForwardClicked="forwardButtonAction"
-					@back-clicked="backButtonAction"
-					:isForwardActionDisabled="!meta.valid"
-				/>
-			</div>	
-		</div>
-	</Form>
+    <Form
+        @submit="onSubmit"
+        @invalid-submit="onInvalidSubmit"
+        ref="theForm"
+        v-slot="{ meta }"
+        autocomplete="off"
+    >
+        <div class="page-container-grouped-styles">
+            <loadingModal ref="loadingModal" />
+            <funnelHeader
+                cmsWidgetName="FunnelHeaderWidget"
+                ref="funnelHeader"
+            />
+            <vehicleBanner
+                cmsWidgetName="VehicleBannerWidget"
+                ref="vehicleBanner"
+                :displayGenericVehicleImage="false"
+            />
+            <funnelSubHeader
+                cmsWidgetName="FunnelSubHeaderWidget"
+                ref="funnelSubHeader"
+            />
+            <div class="fade-on-route-transition sub-container make-tall">
+                <customerQuestions
+                    ref="customerQuestions"
+                    v-model="customerQuestions"
+                />
+                <alert
+                    ref="alertVinNotFound"
+                    v-if="displayVinNotFoundAlert"
+                    class="mb-4"
+                    cmsWidgetName="AlertVinNotFoundWidget"
+                    alertClass="alert-danger"
+                    v-bind:isDismissible="false"
+                />
+                <alert
+                    ref="alertMatchedDifferentVehicle"
+                    v-if="displayMatchedDifferentVehicleAlert"
+                    class="mb-4"
+                    :manualHeadline="AlertMatchedDifferentVehicleHeader"
+                    :manualCopy="AlertMatchedDifferentVehicleBody"
+                    alertClass="alert-warning"
+                    v-bind:isDismissible="false"
+                />
+                <alert
+                    ref="alertNonServiceableZip"
+                    v-if="displayNonServiceableZipAlert"
+                    class="mb-4"
+                    alertClass="alert-danger"
+                    :manualHeadline="AlertNonServiceableZipHeader"
+                    :manualCopy="AlertNonServiceableZipBody"
+                    v-bind:isDismissible="false"
+                />
+                <alert
+                    ref="alertVinLookupsByHomeAddressNotAllowed"
+                    v-if="displayVinLookupByHomeAddressNotAllowedAlert"
+                    class="mb-4"
+                    cmsWidgetName="AlertVinLookupsByHomeAddressNotAllowedWidget"
+                    alertClass="alert-danger"
+                    v-bind:isDismissible="false"
+                />
+                <transition name="fade" mode="out-in">
+                    <div
+                        class="service-zip-field"
+                        v-if="showServiceZipField"
+                        aria-live="polite"
+                    >
+                        <div class="row mb-4">
+                            <div class="col">
+                                <textboxQuestion
+                                    cmsWidgetName="ServiceZipQuestionWidget"
+                                    v-model="serviceZipCode"
+                                    ref="serviceZip"
+                                    inputId="7add1b26df344f2caf1678de5797803f"
+                                    aria-haspopup=""
+                                    mask="#####"
+                                    disableAutoFill
+                                    validationRules="service-zip-required|service-zip-format"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </transition>
+                <funnel-footer
+                    cmsWidgetName="FunnelFooterWidget"
+                    ref="funnelFooter"
+                    :isDisabled="!meta.valid"
+                    @ForwardClicked="forwardButtonAction"
+                    @back-clicked="backButtonAction"
+                    :isForwardActionDisabled="!meta.valid"
+                />
+            </div>
+        </div>
+    </Form>
 </template>
 
 <script>
-
 // Components
 import funnelHeader from "@/common-components/funnel-header/funnel-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
@@ -70,7 +104,7 @@ import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-he
 import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
+import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 
 import { Form, defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
@@ -84,353 +118,467 @@ import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
 import baseMixin from "@/mixins/base-mixin";
 import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
+import {
+    getDamageString,
+    isGlassAvailableForCarId,
+} from "@/helpers/damage-helper";
 
-defineRule("service-zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
-defineRule("service-zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+defineRule(
+    "service-zip-required",
+    required(errorMessages.SERVICE_ZIP_REQUIRED)
+);
+defineRule(
+    "service-zip-format",
+    regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT)
+);
 
 export default {
-	name: "address-lookup",
-	async beforeRouteEnter(to, from, next) {
-		// Call APIs
-		const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+    name: "address-lookup",
+    async beforeRouteEnter(to, from, next) {
+        // Call APIs
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
-		// Settle promises and get results
-		const promiseResultMap = [
-			{
-				resultKey: "cmsContent",
-				promise: cmsContentPromise,
-			},
-		];
+        // Settle promises and get results
+        const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
+        ];
 
-		const resultMap = await settleAllPromises(promiseResultMap);
+        const resultMap = await settleAllPromises(promiseResultMap);
 
-		// Call the "next" function to complete the transition to this page.
-		next((vm) => {
-			vm.setCmsContent(resultMap.cmsContent);
-		});
-	},
-	data() {
-		return {
-			customerQuestions: {
-				addressQuestions: {
-					streetAddress: this.getRegistrationAddressFromStore(),
-					city: this.getRegistrationCityFromStore(),
-					state: this.getRegistrationStateFromStore(),
-					zipCode: this.getRegistrationZipFromStore(),
-				},
-				firstName: this.getRegistrationFirstNameFromStore(),
-				lastName: this.getRegistrationLastNameFromStore(),
-				emailAddress: this.getEmailFromStore(),
-			}, 
-			serviceZipCode: this.getServiceZipFromStore(),
-			displayNonServiceableZipAlert: false,
-			displayVinNotFoundAlert: false,
-			displayMatchedDifferentVehicleAlert: false,
-			displayVinLookupByHomeAddressNotAllowedAlert: false,
-			previouslyEnteredCarId: "",
-			isSelectedGlassAvailableForVehicle: false, 
-			customAlertData: {},
-			showServiceZipField: this.getServiceZipFromStore(),
-			isZipServicable: false,
-		}
-	},
-	methods: {
-		arePagePrerequisitesValid() {
-			return store.getters.vehicle.carId !== null;
-		},
-		resetDependentState() {
-			store.commit(storeMutations.UPDATE_REGISTRATION_LICENSE_PLATE, null);
-			store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES);
-		},
-		backButtonAction() {
-			// route to move backwards
-			this.$router.navigate(
-				this.navigationScenarios.CLICKED_BACK,
-				this.$route
-			);
-		},
-		attachCustomEvents() { 
-       this.prependActionToMethod(this, this.forwardButtonAction, () => {
-      this.pushEventToGA(
-          this.$route.query[this.queryStrings.FMG_PAGE],
-          this.GaActions.SUBMITTED,
-          this.GaLabels.ADDRESS_LOOKUP,
-          true
-     );
-      });
-	},
-		getRegistrationAddressFromStore() {
-			return store.getters.vehicle.registration.address;
-		},
-		getRegistrationCityFromStore() {
-			return store.getters.vehicle.registration.city;
-		},
-		getRegistrationStateFromStore() {
-			return store.getters.vehicle.registration.state;
-		},
-		getRegistrationZipFromStore() {
-			return store.getters.vehicle.registration.zipCode;
-		},
-		getRegistrationFirstNameFromStore() {
-			return store.getters.vehicle.registration.firstName;
-		},
-		getRegistrationLastNameFromStore() {
-			return store.getters.vehicle.registration.lastName;
-		},						
-		getEmailFromStore() {
-			return store.getters.order.customer.emailAddress;
-		},
-		getServiceZipFromStore() {
-			return store.getters.order.serviceLocation.zipCode;
-		},
-		async forwardButtonAction() {
-			this.resetWarningsAndErrors();
+        // Call the "next" function to complete the transition to this page.
+        next((vm) => {
+            vm.setCmsContent(resultMap.cmsContent);
+        });
+    },
+    data() {
+        return {
+            customerQuestions: {
+                addressQuestions: {
+                    streetAddress: this.getRegistrationAddressFromStore(),
+                    city: this.getRegistrationCityFromStore(),
+                    state: this.getRegistrationStateFromStore(),
+                    zipCode: this.getRegistrationZipFromStore(),
+                },
+                firstName: this.getRegistrationFirstNameFromStore(),
+                lastName: this.getRegistrationLastNameFromStore(),
+                emailAddress: this.getEmailFromStore(),
+            },
+            serviceZipCode: this.getServiceZipFromStore(),
+            displayNonServiceableZipAlert: false,
+            displayVinNotFoundAlert: false,
+            displayMatchedDifferentVehicleAlert: false,
+            displayVinLookupByHomeAddressNotAllowedAlert: false,
+            previouslyEnteredCarId: "",
+            isSelectedGlassAvailableForVehicle: false,
+            customAlertData: {},
+            showServiceZipField: this.getServiceZipFromStore(),
+            isZipServicable: false,
+        };
+    },
+    methods: {
+        arePagePrerequisitesValid() {
+            return store.getters.vehicle.carId !== null;
+        },
+        resetDependentState() {
+            store.commit(
+                storeMutations.UPDATE_REGISTRATION_LICENSE_PLATE,
+                null
+            );
+            store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES);
+        },
+        backButtonAction() {
+            // route to move backwards
+            this.$router.navigate(
+                this.navigationScenarios.CLICKED_BACK,
+                this.$route
+            );
+        },
+        attachCustomEvents() {
+            this.prependActionToMethod(this, this.forwardButtonAction, () => {
+                this.pushEventToGA(
+                    this.$route.query[this.queryStrings.FMG_PAGE],
+                    this.GaActions.SUBMITTED,
+                    this.GaLabels.ADDRESS_LOOKUP,
+                    true
+                );
+            });
+        },
+        getRegistrationAddressFromStore() {
+            return store.getters.vehicle.registration.address;
+        },
+        getRegistrationCityFromStore() {
+            return store.getters.vehicle.registration.city;
+        },
+        getRegistrationStateFromStore() {
+            return store.getters.vehicle.registration.state;
+        },
+        getRegistrationZipFromStore() {
+            return store.getters.vehicle.registration.zipCode;
+        },
+        getRegistrationFirstNameFromStore() {
+            return store.getters.vehicle.registration.firstName;
+        },
+        getRegistrationLastNameFromStore() {
+            return store.getters.vehicle.registration.lastName;
+        },
+        getEmailFromStore() {
+            return store.getters.order.customer.emailAddress;
+        },
+        getServiceZipFromStore() {
+            return store.getters.order.serviceLocation.zipCode;
+        },
+        async forwardButtonAction() {
+            this.resetWarningsAndErrors();
 
-			// Lookup VIN(s) with the provided address
-			const vinLookupPromise = this.lookupVin(
-				this.customerQuestions.lastName, 
-				this.customerQuestions.addressQuestions.streetAddress, 
-				this.customerQuestions.addressQuestions.zipCode, 
-				this.customerQuestions.addressQuestions.state
-			);
+            // Lookup VIN(s) with the provided address
+            const vinLookupPromise = this.lookupVin(
+                this.customerQuestions.lastName,
+                this.customerQuestions.addressQuestions.streetAddress,
+                this.customerQuestions.addressQuestions.zipCode,
+                this.customerQuestions.addressQuestions.state
+            );
 
-			// Verify if the service zip code or registration zip code provided is serviceable
-			const serviceZipValidationPromise = this.serviceZipCode ? this.validateZip(this.serviceZipCode) : this.validateZip(this.customerQuestions.addressQuestions.zipCode);
+            // Verify if the service zip code or registration zip code provided is serviceable
+            const serviceZipValidationPromise = this.serviceZipCode
+                ? this.validateZip(this.serviceZipCode)
+                : this.validateZip(
+                      this.customerQuestions.addressQuestions.zipCode
+                  );
 
-			const vinLookupResponse = await vinLookupPromise;
-			const serviceZipValidationResponse = await serviceZipValidationPromise;
-			
-			if (!vinLookupResponse.data.isStatePermissible) {				
-				// State Restrictions forbid lookup by address
-				this.displayVinLookupByHomeAddressNotAllowedAlert = true;
-				this.$refs.funnelFooter.removeLoader();
-				return;
-			}
-			
-			// if the neither the registration zip code or service zip code are not serviceable
-			this.isZipServicable = serviceZipValidationResponse.data.isServiceable;
-			if (!this.isZipServicable) {				
-				this.displayNonServiceableZipAlert = true;
-				this.showServiceZipField = true;
-				this.$refs.funnelFooter.removeLoader();		
-			} else if (!this.serviceZipCode) {
-				// if the registration zip code is servicable and nothing was entered for the service zip code
-				// then set the service zip code to the registration zip code
-				this.serviceZipCode = this.customerQuestions.addressQuestions.zipCode;
-			} 
+            const vinLookupResponse = await vinLookupPromise;
+            const serviceZipValidationResponse =
+                await serviceZipValidationPromise;
 
-			const carEntered = store.getters.vehicle;
-			const carsFound = vinLookupResponse.data.vinVehicles;
+            if (!vinLookupResponse.data.isStatePermissible) {
+                // State Restrictions forbid lookup by address
+                this.displayVinLookupByHomeAddressNotAllowedAlert = true;
+                this.$refs.funnelFooter.removeLoader();
+                return;
+            }
 
-			if (carsFound.length == 0) {
-				// No VINs found					
-				this.displayVinNotFoundAlert = true;
-				this.$refs.funnelFooter.removeLoader();
-				return;				
-			} else if (carsFound.length == 1) {			
-				const carFound = carsFound[0].vehicle;
-				this.isCarIdDifferent = carFound.carId !== carEntered.carId;
+            // if the neither the registration zip code or service zip code are not serviceable
+            this.isZipServicable =
+                serviceZipValidationResponse.data.isServiceable;
+            if (!this.isZipServicable) {
+                this.displayNonServiceableZipAlert = true;
+                this.showServiceZipField = true;
+                this.$refs.funnelFooter.removeLoader();
+            } else if (!this.serviceZipCode) {
+                // if the registration zip code is servicable and nothing was entered for the service zip code
+                // then set the service zip code to the registration zip code
+                this.serviceZipCode =
+                    this.customerQuestions.addressQuestions.zipCode;
+            }
 
-				if (this.isCarIdDifferent && carFound.carId !== this.previouslyEnteredCarId) {	
-					// Display Alert
-					this.previouslyEnteredCarId = carFound.carId;
-					this.customAlertData.vehicleInfo = carFound;
-					this.displayMatchedDifferentVehicleAlert = true;
+            const carEntered = store.getters.vehicle;
+            const carsFound = vinLookupResponse.data.vinVehicles;
 
-					this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(carFound.carId);
+            if (carsFound.length == 0) {
+                // No VINs found
+                this.displayVinNotFoundAlert = true;
+                this.$refs.funnelFooter.removeLoader();
+                return;
+            } else if (carsFound.length == 1) {
+                const carFound = carsFound[0].vehicle;
+                this.isCarIdDifferent = carFound.carId !== carEntered.carId;
 
-					// Update button "Continue with..."
-					this.$refs.funnelFooter.updateButtonText(`Continue with ${carFound.year} ${carFound.make} ${carFound.model}`);				
-					this.$refs.funnelFooter.removeLoader();
-					
-					return;
-				} 				
-								
-				if (!this.isZipServicable) {
-					return;
-				}
+                if (
+                    this.isCarIdDifferent &&
+                    carFound.carId !== this.previouslyEnteredCarId
+                ) {
+                    // Display Alert
+                    this.previouslyEnteredCarId = carFound.carId;
+                    this.customAlertData.vehicleInfo = carFound;
+                    this.displayMatchedDifferentVehicleAlert = true;
 
-				// update data if the zip or service zip is servicable
-				this.updateVehicleInfo(carsFound[0].vin, carFound);
-				this.updateCustomerInfo(serviceZipValidationResponse.data.state);
-	
-			} else if (carsFound.length > 1) {
-				if (!this.isZipServicable) {
-					return;
-				}
+                    this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(carFound.carId);
 
-				// if multiple cars were found
-				let matchingCars = carsFound.filter(car => car.vehicle.carId === carEntered.carId); 
-				if (matchingCars.length === 1) {
-					// and one and only one of them matches the carId entered, save the vehicle info
-					// so we can go to the Heritage Funnel directly
-					const matchingCar = matchingCars[0];
-					this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle);
-				}
-				
-				// update data if the zip or service zip is servicable
-				this.updateCustomerInfo(serviceZipValidationResponse.data.state);
-			}
+                    // Update button "Continue with..."
+                    this.$refs.funnelFooter.updateButtonText(
+                        `Continue with ${carFound.year} ${carFound.make} ${carFound.model}`
+                    );
+                    this.$refs.funnelFooter.removeLoader();
 
-			this.navigateForward(carEntered, carsFound);
-		},
-		resetWarningsAndErrors() {
-			this.displayVinNotFoundAlert = false;
-			this.displayNonServiceableZipAlert = false;	
-			this.displayMatchedDifferentVehicleAlert = false;
-			this.displayVinLookupByHomeAddressNotAllowedAlert = false;
-		},
-		navigateForward(carEntered, carsFound) {
-			this.updateServiceLocationIfNecessary();
-			
-			if (carsFound.length == 1) {
-				// if a different vehicle is found than the one entered and the selected glass
-				// is not available for that vehicle
-				if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
-					this.$router.navigateAfterSave(
-						// then navigate back to "vehicle-damage", and display vehicle changed alert
-						// on that page
-						this.navigationScenarios.CONTINUING_WITH_DIFFERENT_GLASS,
-						this.$route, {}, {
-							displayVehicleChangeAlert: true
-						}, {}
-					);
-				} else {
-					// otherwise 
-					this.$refs.loadingModal.showModal();
-					navigateAfterSaveToHeritageFunnel(this.$route);
-				}				
-			} else if (carsFound.length > 1) {
-				// if multiple cars were found
-				let matchingCars = carsFound.filter(car => car.vehicle.carId === carEntered.carId);  
-				if (matchingCars.length === 1) {
-					this.$refs.loadingModal.showModal();
+                    return;
+                }
 
-					// and one and only of them matches the car id entered
-					const matchingCar = matchingCars[0];					
-					this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle);
-					navigateAfterSaveToHeritageFunnel(this.$route);
-				} else {
-					// if there are no matches or there are multiple matches, navigate to "address-vehicles" page
-					this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_MULTIPLE_VEHICLES, this.$route, {}, {}, carsFound);
-				}
-			} 
+                if (!this.isZipServicable) {
+                    return;
+                }
 
-		},
-		validateZip(zip) {
-			return baseMixin.methods.dispatchStoreAction(
-				storeActions.VALIDATE_ZIP, 
-				{ zip });
-		},
-		lookupVin(lastName, streetAddress, zip, state) {
-			return baseMixin.methods.dispatchStoreAction(
-				storeActions.LOOKUP_VIN_BY_ADDRESS,
-				{ 
-					licenseLastName: lastName, 
-					licenseStreetAddress: streetAddress, 
-					licenseZip: zip, 
-					licenseState: state 
-				}, false
-			);
-		},
-		updateVehicleInfo(vin, vehicleInfo) {
-			store.commit(storeMutations.UPDATE_VEHICLE_VIN, vin);
-			store.commit(storeMutations.UPDATE_YEAR, vehicleInfo.year);
-			store.commit(storeMutations.UPDATE_MAKE, vehicleInfo.make);
-			store.commit(storeMutations.UPDATE_MODEL, vehicleInfo.model);
-			store.commit(storeMutations.UPDATE_STYLE, vehicleInfo.style);
-			store.commit(storeMutations.UPDATE_CAR_ID, vehicleInfo.carId);
-			store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, vehicleInfo.category);
-			store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, vehicleInfo.imageUrl);
-			store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, vehicleInfo.imageVifNumber);
-			store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, vehicleInfo.imageColor);
-		},		
-		updateCustomerInfo(serviceState) {
-			store.commit(storeMutations.UPDATE_REGISTRATION_ADDRESS, this.customerQuestions.addressQuestions.streetAddress);
-			store.commit(storeMutations.UPDATE_REGISTRATION_CITY, this.customerQuestions.addressQuestions.city);
-			store.commit(storeMutations.UPDATE_REGISTRATION_STATE, this.customerQuestions.addressQuestions.state);
-			store.commit(storeMutations.UPDATE_REGISTRATION_ZIP_CODE, this.customerQuestions.addressQuestions.zipCode);
-			store.commit(storeMutations.UPDATE_REGISTRATION_FIRST_NAME, this.customerQuestions.firstName);
-			store.commit(storeMutations.UPDATE_REGISTRATION_LAST_NAME, this.customerQuestions.lastName);
-			store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP_CODE, this.serviceZipCode);			
-			store.commit(storeMutations.UPDATE_SERVICE_LOCATION_STATE, serviceState);			
-			store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.customerQuestions.emailAddress);
-		},		
-		updateServiceLocationIfNecessary() {
-			const serviceLocation = store.getters.order.serviceLocation;
+                // update data if the zip or service zip is servicable
+                this.updateVehicleInfo(carsFound[0].vin, carFound);
+                this.updateCustomerInfo(
+                    serviceZipValidationResponse.data.state
+                );
+            } else if (carsFound.length > 1) {
+                if (!this.isZipServicable) {
+                    return;
+                }
 
-			if (!serviceLocation.address && serviceLocation.zipCode && serviceLocation.zipCode == store.getters.vehicle.registration.zipCode) {
-				baseMixin.methods.dispatchStoreAction(
-					storeActions.UPDATE_SERVICE_LOCATION_WITH_VEHICLE_REGISTRATION
-				);
-			}
-		}
-	},
-	mounted() {
-    this.attachCustomEvents();
-  },
-	computed: {
-		AlertNonServiceableZipHeader(){
-			const zipCode = this.serviceZipCode ? this.serviceZipCode : this.customerQuestions.addressQuestions.zipCode;
-			const text = this.getCmsContent("AlertNonServiceableZipWidget", "HeadlineText").replaceAll("{custom:serviceZip}", zipCode);
-			return text;
-		},
-		AlertNonServiceableZipBody(){
-			return this.getCmsContent("AlertNonServiceableZipWidget", "BodyText");
-		},		
-		AlertMatchedDifferentVehicleHeader(){
-			const text = this.getCmsContent("AlertMatchedDifferentVehicleWidget", "HeadlineText").replaceAll("{custom:glassText}", getDamageString());
-			return text;
-		},
-		AlertMatchedDifferentVehicleBody(){
+                // if multiple cars were found
+                let matchingCars = carsFound.filter(
+                    (car) => car.vehicle.carId === carEntered.carId
+                );
+                if (matchingCars.length === 1) {
+                    // and one and only one of them matches the carId entered, save the vehicle info
+                    // so we can go to the Heritage Funnel directly
+                    const matchingCar = matchingCars[0];
+                    this.updateVehicleInfo(
+                        matchingCar.vin,
+                        matchingCar.vehicle
+                    );
+                }
 
-			const vinYmmFound = `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`;
-			const vinYmmExpected = `${store.getters.vehicle.year} ${store.getters.vehicle.make} ${store.getters.vehicle.model}`;
+                // update data if the zip or service zip is servicable
+                this.updateCustomerInfo(
+                    serviceZipValidationResponse.data.state
+                );
+            }
 
-			const content = this.getCmsContent("AlertMatchedDifferentVehicleWidget", "BodyText")
-				.replaceAll("{custom:glassText}", getDamageString())
-				.replaceAll("{custom:vinYmmFound}", vinYmmFound)
-				.replaceAll("{custom:vinYmmExpected}", vinYmmExpected);			
+            this.navigateForward(carEntered, carsFound);
+        },
+        resetWarningsAndErrors() {
+            this.displayVinNotFoundAlert = false;
+            this.displayNonServiceableZipAlert = false;
+            this.displayMatchedDifferentVehicleAlert = false;
+            this.displayVinLookupByHomeAddressNotAllowedAlert = false;
+        },
+        navigateForward(carEntered, carsFound) {
+            this.updateServiceLocationIfNecessary();
 
-			return content;
-		},		
-	},
-	watch: {
-		customerQuestions: {		
-			handler(newValue) {
-				// if they modify one of the lookup fields (address, city, state, zipCode, or lastName), then modify the button text back to “Get my personalized quote”
-				this.$refs.funnelFooter.updateButtonText(this.getCmsContent("FunnelFooterWidget", "ForwardButtonText"));
-				this.showServiceZipField = false;
-				this.resetWarningsAndErrors();
-			},
-			deep: true
-		},
-		serviceZipCode: {
-			handler(newValue) {
-				// if they modify the service zip code, then hide the error message”
-				this.displayNonServiceableZipAlert = false;
-			},
-		},
-		showServiceZipField: {
-			handler(newValue) {
-				// if the Service Zip Code field is ever hidden, clear out it's value
-				if (!newValue) {
-					this.serviceZipCode = null;
-				}			
-			},			
-		}
-	},
-	components: {
-		funnelHeader,
-		funnelFooter,
-		vehicleBanner,
-		funnelSubHeader,
-		customerQuestions,
-		textboxQuestion,
-		alert,
-		loadingModal,
-		Form
-	},
+            if (carsFound.length == 1) {
+                // if a different vehicle is found than the one entered and the selected glass
+                // is not available for that vehicle
+                if (
+                    this.isCarIdDifferent &&
+                    !this.isSelectedGlassAvailableForVehicle
+                ) {
+                    this.$router.navigateAfterSave(
+                        // then navigate back to "vehicle-damage", and display vehicle changed alert
+                        // on that page
+                        this.navigationScenarios
+                            .CONTINUING_WITH_DIFFERENT_GLASS,
+                        this.$route,
+                        {},
+                        {
+                            displayVehicleChangeAlert: true,
+                        },
+                        {}
+                    );
+                } else {
+                    // otherwise
+                    this.$refs.loadingModal.showModal();
+                    navigateAfterSaveToHeritageFunnel(this.$route);
+                }
+            } else if (carsFound.length > 1) {
+                // if multiple cars were found
+                let matchingCars = carsFound.filter(
+                    (car) => car.vehicle.carId === carEntered.carId
+                );
+                if (matchingCars.length === 1) {
+                    this.$refs.loadingModal.showModal();
+
+                    // and one and only of them matches the car id entered
+                    const matchingCar = matchingCars[0];
+                    this.updateVehicleInfo(
+                        matchingCar.vin,
+                        matchingCar.vehicle
+                    );
+                    navigateAfterSaveToHeritageFunnel(this.$route);
+                } else {
+                    // if there are no matches or there are multiple matches, navigate to "address-vehicles" page
+                    this.$router.navigateAfterSave(
+                        this.navigationScenarios
+                            .CONTINUING_WITH_MULTIPLE_VEHICLES,
+                        this.$route,
+                        {},
+                        {},
+                        carsFound
+                    );
+                }
+            }
+        },
+        validateZip(zip) {
+            return baseMixin.methods.dispatchStoreAction(
+                storeActions.VALIDATE_ZIP,
+                { zip }
+            );
+        },
+        lookupVin(lastName, streetAddress, zip, state) {
+            return baseMixin.methods.dispatchStoreAction(
+                storeActions.LOOKUP_VIN_BY_ADDRESS,
+                {
+                    licenseLastName: lastName,
+                    licenseStreetAddress: streetAddress,
+                    licenseZip: zip,
+                    licenseState: state,
+                },
+                false
+            );
+        },
+        updateVehicleInfo(vin, vehicleInfo) {
+            store.commit(storeMutations.UPDATE_VEHICLE_VIN, vin);
+            store.commit(storeMutations.UPDATE_YEAR, vehicleInfo.year);
+            store.commit(storeMutations.UPDATE_MAKE, vehicleInfo.make);
+            store.commit(storeMutations.UPDATE_MODEL, vehicleInfo.model);
+            store.commit(storeMutations.UPDATE_STYLE, vehicleInfo.style);
+            store.commit(storeMutations.UPDATE_CAR_ID, vehicleInfo.carId);
+            store.commit(
+                storeMutations.UPDATE_VEHICLE_CATEGORY,
+                vehicleInfo.category
+            );
+            store.commit(
+                storeMutations.UPDATE_VEHICLE_IMAGE_URL,
+                vehicleInfo.imageUrl
+            );
+            store.commit(
+                storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER,
+                vehicleInfo.imageVifNumber
+            );
+            store.commit(
+                storeMutations.UPDATE_VEHICLE_IMAGE_COLOR,
+                vehicleInfo.imageColor
+            );
+        },
+        updateCustomerInfo(serviceState) {
+            store.commit(
+                storeMutations.UPDATE_REGISTRATION_ADDRESS,
+                this.customerQuestions.addressQuestions.streetAddress
+            );
+            store.commit(
+                storeMutations.UPDATE_REGISTRATION_CITY,
+                this.customerQuestions.addressQuestions.city
+            );
+            store.commit(
+                storeMutations.UPDATE_REGISTRATION_STATE,
+                this.customerQuestions.addressQuestions.state
+            );
+            store.commit(
+                storeMutations.UPDATE_REGISTRATION_ZIP_CODE,
+                this.customerQuestions.addressQuestions.zipCode
+            );
+            store.commit(
+                storeMutations.UPDATE_REGISTRATION_FIRST_NAME,
+                this.customerQuestions.firstName
+            );
+            store.commit(
+                storeMutations.UPDATE_REGISTRATION_LAST_NAME,
+                this.customerQuestions.lastName
+            );
+            store.commit(
+                storeMutations.UPDATE_SERVICE_LOCATION_ZIP_CODE,
+                this.serviceZipCode
+            );
+            store.commit(
+                storeMutations.UPDATE_SERVICE_LOCATION_STATE,
+                serviceState
+            );
+            store.commit(
+                storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS,
+                this.customerQuestions.emailAddress
+            );
+        },
+        updateServiceLocationIfNecessary() {
+            const serviceLocation = store.getters.order.serviceLocation;
+
+            if (
+                !serviceLocation.address &&
+                serviceLocation.zipCode &&
+                serviceLocation.zipCode ==
+                    store.getters.vehicle.registration.zipCode
+            ) {
+                baseMixin.methods.dispatchStoreAction(
+                    storeActions.UPDATE_SERVICE_LOCATION_WITH_VEHICLE_REGISTRATION
+                );
+            }
+        },
+    },
+    mounted() {
+        this.attachCustomEvents();
+    },
+    computed: {
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCode
+                ? this.serviceZipCode
+                : this.customerQuestions.addressQuestions.zipCode;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZip}", zipCode);
+            return text;
+        },
+        AlertNonServiceableZipBody() {
+            return this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "BodyText"
+            );
+        },
+        AlertMatchedDifferentVehicleHeader() {
+            const text = this.getCmsContent(
+                "AlertMatchedDifferentVehicleWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:glassText}", getDamageString());
+            return text;
+        },
+        AlertMatchedDifferentVehicleBody() {
+            const vinYmmFound = `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`;
+            const vinYmmExpected = `${store.getters.vehicle.year} ${store.getters.vehicle.make} ${store.getters.vehicle.model}`;
+
+            const content = this.getCmsContent(
+                "AlertMatchedDifferentVehicleWidget",
+                "BodyText"
+            )
+                .replaceAll("{custom:glassText}", getDamageString())
+                .replaceAll("{custom:vinYmmFound}", vinYmmFound)
+                .replaceAll("{custom:vinYmmExpected}", vinYmmExpected);
+
+            return content;
+        },
+    },
+    watch: {
+        customerQuestions: {
+            handler(newValue) {
+                // if they modify one of the lookup fields (address, city, state, zipCode, or lastName), then modify the button text back to “Get my personalized quote”
+                this.$refs.funnelFooter.updateButtonText(
+                    this.getCmsContent(
+                        "FunnelFooterWidget",
+                        "ForwardButtonText"
+                    )
+                );
+                this.showServiceZipField = false;
+                this.resetWarningsAndErrors();
+            },
+            deep: true,
+        },
+        serviceZipCode: {
+            handler(newValue) {
+                // if they modify the service zip code, then hide the error message”
+                this.displayNonServiceableZipAlert = false;
+            },
+        },
+        showServiceZipField: {
+            handler(newValue) {
+                // if the Service Zip Code field is ever hidden, clear out it's value
+                if (!newValue) {
+                    this.serviceZipCode = null;
+                }
+            },
+        },
+    },
+    components: {
+        funnelHeader,
+        funnelFooter,
+        vehicleBanner,
+        funnelSubHeader,
+        customerQuestions,
+        textboxQuestion,
+        alert,
+        loadingModal,
+        Form,
+    },
 };
 </script>