diff --git a/src/layouts/endorsements-page/endorsements-page.vue b/src/layouts/endorsements-page/endorsements-page.vue
index 17410a15..4277b73b 100644
--- a/src/layouts/endorsements-page/endorsements-page.vue
+++ b/src/layouts/endorsements-page/endorsements-page.vue
@@ -9,25 +9,14 @@
                 <siteHeader cmsWidgetName="SiteHeaderWidget" />
                 <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" class="mt-5 mb-5 endorsements" />
                 <div class="container-fluid pb-2">
-                <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
+                <buttonQuestion
                     v-model="schoolPropertyAnswer"
                     class="radioQuestion"
                     cmsWidgetName="SchoolPropertyQuestion"
                     :questionText="schoolPropertyQuestionText"
                     :answers="schoolPropertyAnswersFromCms"
+                    groupName="schoolProperty"
+                    buttonID="schoolPropertyQuestion"
                     buttonTypeString="listButtonHorizontal"
                     isRequired
                     :validationRules="rules.selectionRequired">
@@ -38,10 +27,12 @@
                     cmsWidgetName="ParkingLotQuestion"
                     :questionText="parkingLotQuestionText"
                     :answers="parkingLotAnswersFromCms"
+                    groupName="parkingLot"
+                    buttonID="parkingLotQuestion"
                     buttonTypeString="listButtonHorizontal"
                     isRequired
                     :validationRules="rules.selectionRequired">
-                </buttonQuestion> -->
+                </buttonQuestion>
                     <siteFooter
                     ref="siteFooter"
                     cmsWidgetName="SiteFooterWidget"
@@ -100,17 +91,6 @@ export default {
     emits: ['update:modelValue'],
     data() {
         return {
-            questions: [
-                {
-                    questionText: "test question?",
-                    answers: ["Yes", "No"]
-                },
-                {
-                    questionText: "test question 2?",
-                    answers: ["Yes", "No"]
-                }
-            ],
-            selectedAnswers: {},
             schoolPropertyAnswer: '',
             parkingLotAnswer: '',
             rules: {