diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1ded09677..4767a7739 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,7 +26,7 @@ resources:
       type: github
       name: Safelite/AzureDevOps
       endpoint: Safelite
-      ref: refs/tags/t5.5.19
+      ref: refs/tags/t5.5.31
 
 variables:
   - group: Digital-Infrastructure
@@ -173,5 +173,6 @@ stages:
                     cfDistributionId: $(cfDistributionId)
       - template: templates/digital/auto-tag.yml@AzureDevOps
         parameters:
+          dependsOn: prodBuildDeployment
           userName: SafeliteAzureDevops
           userEmail: githubazuredevops@safelite.com
\ No newline at end of file
diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index 686c53136..4dd99fbc5 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -60,6 +60,11 @@ export default {
           ul {
             margin-bottom: 0;
           }
+          p {
+            &:last-child {
+              margin-bottom: 0;
+            }
+          }
         }
       }
     }
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 0630d8b65..9720598eb 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -50,6 +50,7 @@ export async function navigateToHeritageFunnel(shouldSaveOrder = true) {
         {
             corid: store.getters.order.referralCorrelationId,
             src: "concept-funnel",
+            conceptsqid: store.getters.applicationUser.savedSessionId
         }
     );
 }
diff --git a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.spec.js b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.spec.js
new file mode 100644
index 000000000..7dbe32604
--- /dev/null
+++ b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.spec.js
@@ -0,0 +1,57 @@
+import { shallowMount } from "@vue/test-utils";
+import CashOrInsuranceQuestion from "./cash-or-insurance-question";
+
+
+describe("cash-or-insurance-question.vue", () => {
+    it("Should emit a false boolean value when selectedValues is 'CashAnswer' (update:modelValue)", async () => {
+        
+        //Arrange
+        const wrapper = shallowMount(CashOrInsuranceQuestion, {
+            propsData: mockProps,
+            mixins: [mockMixin]
+        });
+
+        //Act
+        wrapper.vm.selectedValues = "CashAnswer";
+        await wrapper.vm.$nextTick();
+
+        //Assert
+        expect(wrapper.emitted()["update:modelValue"][0]).toEqual([false]);
+        expect(typeof wrapper.emitted()["update:modelValue"][0][0]).toBe("boolean");
+    });
+    it("Should return 'CashAnswer' from selectedValues when modelValue is set to false", async () => {
+
+        //Arrange
+        const wrapper = shallowMount(CashOrInsuranceQuestion, {
+            propsData: mockProps,
+            mixins: [mockMixin]
+        });
+
+        //Act
+        wrapper.setProps({modelValue : false});
+        await wrapper.vm.$nextTick();
+
+        //Assert
+        expect(wrapper.vm.selectedValues).toBe("CashAnswer");
+    });
+});
+
+                        ///////////////
+                        // Constants //
+                        ///////////////
+
+const mockMixin = {
+  methods: {
+    getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+        return mockCmsContent[cmsFieldName];
+    })
+  }
+}
+
+const mockProps = {
+    modelValue: true,
+}
+
+const mockCmsContent = {
+    'Text': "Sample text here.",
+}
diff --git a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
index b2431406d..f745e8443 100644
--- a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
+++ b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
@@ -14,6 +14,9 @@
 <script>
 import buttonQuestion from "@/common-components/button-question/button-question";
 
+const cashAnswer = "CashAnswer";
+const insuranceAnswer = "InsuranceAnswer";
+
 export default ({
     name: "cashOrInsuranceQuestion",
     props: {               
@@ -23,17 +26,18 @@ export default ({
     },
     computed: {
         answersFromCms(){
+            //console.log(JSON.parse(JSON.stringify(this.getCmsContent(this.cmsWidgetName, 'Answers'))));
             return this.getCmsContent(this.cmsWidgetName, 'Answers');
         },
         selectedValues: {
             get: function() {
                 // Convert to CMS answer name from bool
-                var cmsAnswerValue = this.modelValue ? "InsuranceAnswer" : "CashAnswer";
+                var cmsAnswerValue = this.modelValue ? insuranceAnswer : cashAnswer;
                 return cmsAnswerValue;
             },
             set: function(newValue) {
                 // Convert back to bool for parent component
-                this.$emit("update:modelValue", newValue === "InsuranceAnswer");
+                this.$emit("update:modelValue", newValue === insuranceAnswer);
             }
         },
     },
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index c5779a7f2..b7fa93080 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -133,19 +133,43 @@ export default {
     // Call APIs
     const cmsContent = await fetchCmsContentForPage(to.query.fmgPage);
 
+    // TODOS - modify as needed, just a rough sketch to place initializations
+
+    // get supporting lineitems
+
+    // get wiper and rain defense lineitems
+
+    // Settle promises and get results
+
+    // get price of supporting, rain defense & wipers, and parts
+
+    // Settle pricing promise and get results
+
+
     // Call the "next" function to complete the transition to this page.
     next((vm) => {
       vm.setCmsContent(cmsContent);
+      vm.isInsurance = vm.getDefaultIsInsuranceValue();
     });
   },
   data(){
     return {
-      isInsurance: false,
+      cashOrInsuranceThreshhold: 600,
+      pricingRequestResult: null,
+      isInsurance: null,
     }
   },
   methods: {
     arePagePrerequisitesValid() {
       return store.getters.order.damage.isRepair || (store.getters.order.lineItems?.glassParts != null && store.getters.order.lineItems.glassParts.length > 0);
+    },
+    getDefaultIsInsuranceValue() {
+      var defaultIsInsuranceValue = this.$store.getters.order.payment.isInsurance;
+      if(defaultIsInsuranceValue != null) {
+        return defaultIsInsuranceValue;
+      } else {
+        return this.economyPackagePrice > this.cashOrInsuranceThreshhold;
+      }
     }
   },
   computed: {
@@ -155,6 +179,10 @@ export default {
     answersFromCms() {
       return ["Pay on my own", "Pay with insurance"];
     },
+    economyPackagePrice() {
+      //TODO build out the pricing logic CSR-504
+      return 0;
+    },
     selectedChipCountValues: {
       get: function() {
         return this.modelValue;
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
index 80537bf62..ef7236a56 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
@@ -195,7 +195,7 @@ describe.skip("list-button-horizontal.vue", () => {
     });
     wrapper.vm.handleCheckChange();
     // Assert
-    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{value: "List Card Checkbox", checkValue: Boolean, buttonId: undefined, checkValue: undefined}]);
+    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{value: "List Card Checkbox", checkValue: Boolean, buttonId: undefined, checkValue: false}]);
   });
 
   it("Should set checkValue data if selectedButtonIDs has value(s)", async () => {