diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 741bc56ab..808210dca 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="select-car">
+<div v-if="isPageReady" class="select-car">
     <div class="select-car-form rounded text-center">
         <Header :text="headerTextWidgets[0].HeaderText" class="Header" />
         <yearQuestion :questionText="radioQuestionWidgets[0].QuestionText" />
@@ -17,16 +17,16 @@ export default {
         return {
             headerTextWidgets: {},
             radioQuestionWidgets: {},
+            isPageReady: false,
         };
     },
     computed: {},
-    created() {
-        let self = this;
-        
-        this.GetContentFromCms().then(response => {
-            self.headerTextWidgets = response.HeaderTextWidget;
-            self.radioQuestionWidgets = response.RadioQuestionWidget;
-        });
+    async created() {
+        const pageContent = await this.GetContentFromCms();
+
+        this.headerTextWidgets = pageContent.HeaderTextWidget;
+        this.radioQuestionWidgets = pageContent.RadioQuestionWidget;
+        this.isPageReady = true;
 
     },
     components: {
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index 2d9b08b1c..99ddaa7c6 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -1,5 +1,5 @@
 <template>
-<radioQuestion class="radioQuestion" :questionText="questionText" :answers="years" :chooseAnswer="selectYear" />
+<radioQuestion class="radioQuestion" :questionText="questionText" :answers="years" />
 </template>
 
 <script>
diff --git a/src/mixins/baseMixin.js b/src/mixins/baseMixin.js
index 1bb6b23f5..915b43ab5 100644
--- a/src/mixins/baseMixin.js
+++ b/src/mixins/baseMixin.js
@@ -34,7 +34,6 @@ export default {
             pageDataFromCms[widget.Type] = [widget.Model];
           }
         });
-
         return pageDataFromCms;
       });
     },
diff --git a/src/store/index.js b/src/store/index.js
index 87c8a35da..5a2a60769 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,7 +9,59 @@ export default createStore({
       storage: window.sessionStorage,
     }),
   ],
-  state: {},
+  state: {
+    order: {
+      vehicle: {
+        year: 0,
+        make: '',
+        model: '',
+        style: '',
+        vin: '',
+        licensePlate: '',
+        carId: '',
+        evoxImageId: '',
+        hasSplitWindshieldOption: false,
+        hasBackglassSliderOption: false,
+        registration: {
+          rawAddress: '',
+          zipCode: '',
+          firstName: '',
+          lastName: '',
+          licensePlate: ''
+        },
+        damage: {
+          isRepair: false,
+          isReplacement: false,
+          numberOfChips: 0,
+          glassToReplace: [],
+          problemGlassQuestions: [],
+          problemMoldingQuestions: [],
+          problemPropertyQuestions: [],
+        },
+        items: [],
+        customer: {
+          emailAddress: '',
+          firstName: '',
+          lastName: '',
+          phoneNumber: {
+            isMobile: false,
+            optInSms: false,
+          }
+        },
+        payment: {
+          isInsurance: false,
+          isCash: false,
+        },
+        referral: {
+          referralSeqNum: 0,
+          workOrderId: ''
+        }
+      }
+    },
+    applicationUser: {
+      experiments: [],
+    }
+  },
   mutations: {},
   actions: {
     // Vehicle API Actions