diff --git a/src/common-components/input-button-wrapper/input-button-wrapper.vue b/src/common-components/input-button-wrapper/input-button-wrapper.vue
index 374b4b5e0..e9368df30 100644
--- a/src/common-components/input-button-wrapper/input-button-wrapper.vue
+++ b/src/common-components/input-button-wrapper/input-button-wrapper.vue
@@ -82,7 +82,8 @@ export default {
   mounted() {
     console.log({
       isChecked: this.isChecked,
-      modelValue: this.modelValue
+      modelValue: this.modelValue,
+      value: this.value
     })
 
     this.handleChange(this.modelValue)
@@ -237,7 +238,7 @@ export default {
   computed: {
     isChecked() {
       if (this.isMultiSelect && this.modelValue instanceof Array) {
-        this.modelValue.includes(this.value);
+        return this.modelValue.includes(this.value);
       }
       return this.modelValue === this.value;
     },
diff --git a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
index 8c679d4f6..e658305c3 100644
--- a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
+++ b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="damage-location-question">
+        DLQ selectedValue: {{selectedValue}}
         <buttonQuestion
             :questionText="questionText"
             isMultiSelect
diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
index 9058f2fcb..721d049ed 100644
--- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
+++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
@@ -48,8 +48,10 @@ export default ({
         updateSelectedValues() {
             // UPDATE SELECTEDVALUES IF ONLY ONE ANSWER
             // ex: BackGlass stationary
+            // console.log(this.answersToDisplay)
             if(Array.isArray(this.answersToDisplay) && this.answersToDisplay.length === 1) {
                 this.selectedValue = [this.answersToDisplay[0].Name];
+                console.log("HIIIIII2", this.selectedValue)
             }
         },
     },
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 87ca23963..432d71958 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -17,7 +17,8 @@
             alertClass="alert-warning"
             :isDismissible="false"
           />
-          selectedDamageLocations: {{selectedDamageLocations}}
+          selectedDamageLocations: {{selectedDamageLocations}} <br/>
+          
           <damageLocationQuestion
             ref="damageLocation"
             cmsWidgetName="DamageLocationQuestion"
@@ -129,9 +130,9 @@ export default {
       // vm.$refs.sideDoorOptions.initializeComponent(
       //   resultMap.damageOptions.driverSideOptions.availableReplacementOptions, resultMap.damageOptions.passengerSideOptions.availableReplacementOptions
       // );
-      // vm.$refs.windshieldOptions.initializeComponent(
-      //   resultMap.damageOptions.windshieldOptions.availableReplacementOptions
-      // );
+      vm.$refs.windshieldOptions.initializeComponent(
+        resultMap.damageOptions.windshieldOptions.availableReplacementOptions
+      );
       // vm.$refs.backGlassOptions.initializeComponent(
       //   resultMap.damageOptions.backGlassOptions.availableReplacementOptions
       // );
@@ -287,6 +288,7 @@ export default {
         selectedWindshieldChipCount: this.selectedWindshieldOptions.selectedWindshieldChipCount
       }, false);
       
+      console.log(this.selectedGlassToReplace())
       return this.navigateForward();
     },
 
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 290da4d6e..db5478f57 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -22,7 +22,8 @@
             v-model="selectedWindshieldChipCountValues"
             validationRules="windshield-chip-count-required"
         />
-        <!-- 
+        
+        WO selectedWindshieldReplaceOptionsValues: {{selectedWindshieldReplaceOptionsValues}}
         <replaceOptionsQuestion ref="replaceOptionsQuestion" cmsWidgetName="WindshieldReplaceOptionsQuestion"
             :isAvailable="isReplaceOptionSelected"
             isMultiSelect
@@ -31,7 +32,7 @@
             validationRules="windshield-replace-options-required|prevent-split-and-single-together"
             :suppressError="hasSplitSingleConflict"
             isRequired
-        /> -->
+        />
         <alert
             v-if="hasSplitSingleConflict"
             class="mt-5"
@@ -112,6 +113,7 @@ export default ({
                 return this.modelValue;
             },
             set: function(newValue) {
+                // console.log("HIIII", newValue)
                 this.$emit("update:modelValue", newValue);
             }
         },
@@ -136,6 +138,7 @@ export default ({
                 return this.selectedValues.selectedWindshieldReplaceOptions;
             },
             set: function(newValue) {
+                console.log("HIIII", newValue)
                 this.selectedValues = this.getWindshieldOptions(this.selectedWindshieldDamageTypeValue, null, newValue);
             }
         },
@@ -181,7 +184,7 @@ export default ({
     components: {
         windshieldDamageTypeQuestion,
         windshieldChipCountQuestion,
-        // replaceOptionsQuestion,
+        replaceOptionsQuestion,
         alert,
     },
 })
diff --git a/src/mixins/button-question-wrapper-mixin.js b/src/mixins/button-question-wrapper-mixin.js
index 14119d815..2ff15a6c2 100644
--- a/src/mixins/button-question-wrapper-mixin.js
+++ b/src/mixins/button-question-wrapper-mixin.js
@@ -8,6 +8,10 @@ export default {
       selectedValue: null,
     };
   },
+  mounted() {
+    console.log("MOUNTED: ", this.modelValue)
+    this.selectedValue = this.modelValue;
+  },
   watch: {
     selectedValue(selectedValue) {
       console.log("selectedValue: ", selectedValue)