diff --git a/src/layouts/endorsements-page/endorsements-page.vue b/src/layouts/endorsements-page/endorsements-page.vue
index 46dac883..17410a15 100644
--- a/src/layouts/endorsements-page/endorsements-page.vue
+++ b/src/layouts/endorsements-page/endorsements-page.vue
@@ -9,24 +9,39 @@
                 <siteHeader cmsWidgetName="SiteHeaderWidget" />
                 <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" class="mt-5 mb-5 endorsements" />
                 <div class="container-fluid pb-2">
-                <buttonQuestion
+                <div
+                    v-for="(q, i) in questions"
+                    :key="i"
+                    class="questionBlock">
+                        <buttonQuestion
+                            class="radioQuestion"
+                            :questionText="q.questionText"
+                            :answers="q.answers"
+                            :modelValue="q.answerSelected"
+                            isRequired
+                            :validationRules="validationRules"
+                            @update:modelValue="handleAnswer(q, $event)" />
+                </div>  
+                <!-- <buttonQuestion
                     v-model="schoolPropertyAnswer"
+                    class="radioQuestion"
                     cmsWidgetName="SchoolPropertyQuestion"
                     :questionText="schoolPropertyQuestionText"
                     :answers="schoolPropertyAnswersFromCms"
-                    buttonTypeString="listButton"
+                    buttonTypeString="listButtonHorizontal"
                     isRequired
                     :validationRules="rules.selectionRequired">
                 </buttonQuestion>
                 <buttonQuestion
                     v-model="parkingLotAnswer"
+                    class="radioQuestion"
                     cmsWidgetName="ParkingLotQuestion"
                     :questionText="parkingLotQuestionText"
                     :answers="parkingLotAnswersFromCms"
-                    buttonTypeString="listButton"
+                    buttonTypeString="listButtonHorizontal"
                     isRequired
                     :validationRules="rules.selectionRequired">
-                </buttonQuestion>
+                </buttonQuestion> -->
                     <siteFooter
                     ref="siteFooter"
                     cmsWidgetName="SiteFooterWidget"
@@ -44,6 +59,9 @@ import siteHeader from '@/iss-components/site-header/site-header.vue';
 import siteSubHeader from '@/iss-components/site-sub-header/site-sub-header.vue';
 import siteFooter from '@/iss-components/site-footer/site-footer.vue';
 import buttonQuestion from '@/digital-components/button-question/button-question.vue';
+import questionsPageLayout from '@/iss-components/questions-page-layout/questions-page-layout.vue';
+import questionChain from '@/digital-components/question-chain/question-chain.vue';
+
 // Supporting files
 import { fetchCmsContentForPage } from '@/helpers/cms-content-helper';
 import { settleAllPromises } from '@/helpers/layout-helper';
@@ -58,6 +76,8 @@ export default {
         siteSubHeader,
         siteFooter,
         buttonQuestion,
+        questionsPageLayout,
+        questionChain,
         // eslint-disable-next-line vue/no-reserved-component-names
         Form
     },
@@ -77,8 +97,20 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
+    emits: ['update:modelValue'],
     data() {
         return {
+            questions: [
+                {
+                    questionText: "test question?",
+                    answers: ["Yes", "No"]
+                },
+                {
+                    questionText: "test question 2?",
+                    answers: ["Yes", "No"]
+                }
+            ],
+            selectedAnswers: {},
             schoolPropertyAnswer: '',
             parkingLotAnswer: '',
             rules: {