diff --git a/public/index.html b/public/index.html
index 97071c00..7edb81cc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="">
+<html lang="en-US">
   <head>
     <script>
       window.dataLayer = [{}];
diff --git a/src/App.vue b/src/App.vue
index 554b3117..a561a4fa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,4 +13,4 @@
    @import "@/styles/common-typography-styles.scss";
    @import "@/styles/common-error-styles.scss";
    @import "@/styles/common-animations.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/global-methods.js b/src/global-methods.js
index 8e4c027c..749846aa 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -1,10 +1,10 @@
 import axios from "axios";
-//import analyticsMixIn from "@/mixins/analytics-mixin.js";
+import analyticsMixIn from "@/mixins/analytics-mixin.js";
+import { useMainStore } from "@/store";
 
 import { applicationConfig } from "@/constants/application-config.js";
 import { GaCategories, GaActions, GaLabels } from "@/constants/analytics";
 import { headerKeys } from "@/constants/header-keys";
-import { useMainStore } from "@/store";
 
 export default {
   callHttpClient({ method, endpoint, payload, logApiCall = true}) {
@@ -25,14 +25,12 @@ export default {
         })
         .then((response) => {
           if (logApiCall) {
-            /*
             analyticsMixIn.methods.pushEventToGA(
                 GaCategories.API_RESPONSE,
                 GaActions.RESULT,
                 `${GaLabels.SUCCESS}_${endpoint}`,
                 true
             );
-            */
           }
 
           return resolve(response);
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index f074ecbc..60eceb37 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -33,9 +33,18 @@
       // Supporting files
     import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
     import { settleAllPromises } from "@/helpers/layout-helper";
+    import { useMainStore } from "@/store";
 
     export default {
         name: 'vehicle-make',
+        setup()
+        {
+          const mainStore = useMainStore()
+
+          return {
+            mainStore,
+          }
+        },
         data() {
             return {
                 selectedMake: null,
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index e8019416..90a4f1aa 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -28,9 +28,18 @@
   // Supporting files
   import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
   import { settleAllPromises } from "@/helpers/layout-helper";
+  import { useMainStore } from "@/store";
   
   export default {
     name: "vehicle-model",
+    setup()
+    {
+      const mainStore = useMainStore()
+
+      return {
+        mainStore,
+      }
+    },
     data() {
       return {
         selectedModel: null,
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 531c6693..19b6b897 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -29,10 +29,19 @@ import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import { useMainStore } from "@/store";
 
 
 export default {
     name: "vehicle-style",
+    setup()
+    {
+        const mainStore = useMainStore()
+
+        return {
+        mainStore,
+        }
+    },
     data() {
         return {
             selectedStyle: null,
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 96fa0804..a07b203a 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -28,9 +28,18 @@
   // Supporting files
   import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
   import { settleAllPromises } from "@/helpers/layout-helper";
+  import { useMainStore } from "@/store";
   
   export default {
     name: "vehicle-year",
+    setup()
+    {
+      const mainStore = useMainStore()
+
+      return {
+        mainStore,
+      }
+    },
     data() {
       return {
         selectedYear: null,
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index 0cd35425..deb0ef04 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -18,6 +18,14 @@
   
   export default {
     name: "year-question",
+    setup()
+    {
+      const mainStore = useMainStore()
+
+      return {
+        mainStore,
+      }
+    },
     data() {
       return {
         years: Array,
diff --git a/src/main.js b/src/main.js
index c2286c23..f4e0e49d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,13 +18,14 @@ const vueApp = createApp(App);
 const pinia = createPinia();
 vueApp.use(pinia);
 pinia.use(piniaPluginPersistedstate);
-useMainStore().populateInitialState();
+useMainStore().populateInitialState()
+
 
 // Additional Vue items to setup
 vueApp.use(router);
+vueApp.use(Maska);
 vueApp.mixin(baseMixin);
 vueApp.mixin(analyticsMixin);
 vueApp.mixin(experimentMixin);
-vueApp.use(Maska);
 
 vueApp.mount("#app");
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 6be54fa5..0bef1112 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -17,9 +17,10 @@ import {
 } from "@/constants/analytics";
 import { cookieNames } from "@/constants/cookie-names";
 import { useMainStore } from "@/store";
+import { mapStores } from "pinia";
 
 import baseMixin from "@/mixins/base-mixin";
-import { mapStores } from "pinia";
+
 
 export default {
     methods: {                
@@ -73,6 +74,8 @@ export default {
 
             pushToDataLayerIfDefined(eventToBePushed);
 
+            console.log("GA REPLY -" + eventToBePushed);
+
             if (pushToLogApp) {
                 this.logCustomEvent(category, action, labelToLog, undefined);
             }
@@ -171,7 +174,7 @@ export default {
         },
     },
     computed: {
-        ...mapStores(useMainStore),
+        //...mapStores(useMainStore),
 
         analyticsPageEvents() {
             return analyticsPageEvents;
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index f8c3b0e2..2d48683a 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -1,5 +1,7 @@
-import { useMainStore } from "@/store";
+
 import { mapActions, mapStores } from "pinia";
+import { useMainStore } from "@/store";
+
 import { storeActions } from "@/constants/store-actions.js";
 import { storeMutations } from "@/constants/store-mutations.js";
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
@@ -36,12 +38,12 @@ export default {
     },
     savePageDataToStore(page, data) {
       // TODO: Fix this!
-        //this.mainStore.commit(storeMutations.UPDATE_PAGE_DATA, { page: page, data: data });
+      //this.useMainStore.commit(storeMutations.UPDATE_PAGE_DATA, { page: page, data: data });
     },
   },
   computed: {
-        // store will be accessible globally as its id + 'Store'        
-    ...mapStores(useMainStore),
+    // store will be accessible globally as its id + 'Store'        
+    //...mapStores(useMainStore),
 
     storeActions() {
       return storeActions;
diff --git a/src/router/index.js b/src/router/index.js
index b8b4ff46..d120bee9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -149,6 +149,7 @@ function navigateToUrl(url, optionalQuery = {}) {
 function getNavigationMap (scenario, currentRoute) {
     const issPageValue = currentRoute.query.issPage;
     try {
+
         const matchedQueryValue = routingTable(useMainStore())
         .filter(
             (item) =>
diff --git a/src/store/index.js b/src/store/index.js
index d5ea0e55..a14cd2db 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -256,6 +256,7 @@ export const useMainStore = defineStore({
               shouldUseSessionId: shouldUseSessionId,
               experimentsForUser: experimentsForUser,
       }
+
           return globalMethods.callHttpClient({
               method: endpoints.LogPageView.method,
               endpoint: endpoints.LogPageView.url,
