diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index ff36a9dc..feaa49c4 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -222,7 +222,8 @@ todo:3 Whats new in this release popup or link tied into the update process of t
 
 
 todo:1 update to latest postgres portable and document how to do it as well or a link to how to do it
-
+todo: 1 if a customer type logs in, does Auth check to see that customer or headoffice is active?
+	because if it isn't the user shouldn't be allowed to login either
 	
 todo:1 Joyce case 3931 test restore of 4alarm data
 	Get a copy from Joyce on the red drive, it's about 5gb
diff --git a/ayanova/src/views/customer-csr.vue b/ayanova/src/views/customer-csr.vue
index e9d91539..8b226983 100644
--- a/ayanova/src/views/customer-csr.vue
+++ b/ayanova/src/views/customer-csr.vue
@@ -1,25 +1,176 @@
 <template>
   <div>
-    {{ $store.state.customerRights }}
-
-    <UnderConstruction data-cy="underconstruction" />
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="aType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="csr-list"
+      data-list-key="CustomerServiceRequestDataList"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="csrTable"
+    >
+    </gz-data-table>
   </div>
 </template>
 
 <script>
-import UnderConstruction from "../components/underconstruction.vue";
-
+const FORM_KEY = "customer-csr-list";
 export default {
-  components: {
-    UnderConstruction
+  created() {
+    this.rights = window.$gz.role.getRights(
+      window.$gz.type.CustomerServiceRequest
+    );
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
   },
-  beforeCreate() {
-    window.$gz.eventBus.$emit("menu-change", {
-      isMain: true,
-      icon: "$ayiConciergeBell",
-      title: "CustomerServiceRequestList",
-      helpUrl: "customer-csr"
-    });
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.CustomerServiceRequest,
+      selectedItems: [],
+      reload: false
+    };
+  },
+  methods: {
+    handleSelected(selected) {
+      this.selectedItems = selected;
+    }
   }
 };
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "new":
+        m.vm.$router.push({
+          name: "csr-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(
+            window.$gz.type.CustomerServiceRequest
+          )
+        );
+        if (res && res.refresh == true) {
+          m.vm.reload = !m.vm.reload;
+        }
+        break;
+      case "report":
+        if (m.id != null) {
+          //last report selected is in m.id
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.CustomerServiceRequest
+            }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.CustomerServiceRequest
+            )
+          );
+
+          //if null for no selection
+          //just bail out
+          if (res == null) {
+            return;
+          }
+          //persist last report selected
+          window.$gz.form.setLastReport(FORM_KEY, res);
+
+          //Now open the report viewer...
+          m.vm.$router.push({
+            name: "ay-report",
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.CustomerServiceRequest
+            }
+          });
+        }
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiConciergeBell",
+    title: "CustomerServiceRequestList",
+    helpUrl: "customer-csr",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.CustomerServiceRequest
+    }
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      surface: true,
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  //REPORTS
+  //Report not Print, print is a further option
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$ayiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Extensions",
+    icon: "$ayiPuzzlePiece",
+    key: FORM_KEY + ":extensions",
+    vm: vm
+  });
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
 </script>