diff --git a/ayanova/src/api/open-object-handler.js b/ayanova/src/api/open-object-handler.js
index 7058cbe0..78919221 100644
--- a/ayanova/src/api/open-object-handler.js
+++ b/ayanova/src/api/open-object-handler.js
@@ -275,6 +275,12 @@ export default {
             params: { recordid: tid.id }
           });
           break;
+        case ayatype.Contract:
+          vm.$router.push({
+            name: "contract-edit",
+            params: { recordid: tid.id }
+          });
+          break;
 
         default:
           window.$gz.eventBus.$emit(
diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index 3e492502..391a0d58 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -358,6 +358,12 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "svc" */ "./views/svc-contracts.vue")
     },
+    {
+      path: "/svc-contracts/:recordid",
+      name: "contract-edit",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-contract.vue")
+    },
     {
       path: "/svc-projects",
       name: "svc-projects",
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
new file mode 100644
index 00000000..7fb0aac2
--- /dev/null
+++ b/ayanova/src/views/svc-contract.vue
@@ -0,0 +1,681 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <div v-if="formState.ready">
+      <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
+      <v-form ref="form">
+        <v-row>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-text-field
+              v-model="obj.name"
+              :readonly="formState.readOnly"
+              :label="$ay.t('ContractName')"
+              :rules="[form().required(this, 'name')]"
+              :error-messages="form().serverErrors(this, 'name')"
+              ref="name"
+              data-cy="name"
+              @input="fieldValueChanged('name')"
+            ></v-text-field>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <gz-duration-picker
+              v-model="obj.responseTime"
+              :readonly="formState.readOnly"
+              :label="$ay.t('ResponseTime')"
+              :show-seconds="false"
+              ref="responseTime"
+              data-cy="responseTime"
+              :error-messages="form().serverErrors(this, 'responseTime')"
+              @input="fieldValueChanged('responseTime')"
+            ></gz-duration-picker>
+          </v-col>
+          <v-col cols="12">
+            {{ $ay.t("ContractDefaultAdjustments") }}
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <gz-decimal
+              v-model="obj.partsOverride"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaxCodeTaxA')"
+              ref="partsOverride"
+              data-cy="partsOverride"
+              :rules="[
+                form().decimalValid(this, 'partsOverride'),
+                form().required(this, 'partsOverride')
+              ]"
+              :error-messages="form().serverErrors(this, 'partsOverride')"
+              @input="fieldValueChanged('partsOverride')"
+            ></gz-decimal>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.active"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="active"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
+          <v-col v-if="form().showMe(this, 'AlertNotes')" cols="12">
+            <v-textarea
+              v-model="obj.alertNotes"
+              :readonly="formState.readOnly"
+              :label="$ay.t('AlertNotes')"
+              :error-messages="form().serverErrors(this, 'alertNotes')"
+              ref="alertNotes"
+              data-cy="alertNotes"
+              @input="fieldValueChanged('alertNotes')"
+              auto-grow
+            ></v-textarea>
+          </v-col>
+          <!-- --------------------------------- -->
+          <v-col v-if="form().showMe(this, 'Notes')" cols="12">
+            <v-textarea
+              v-model="obj.notes"
+              :readonly="formState.readOnly"
+              :label="$ay.t('ContractNotes')"
+              :error-messages="form().serverErrors(this, 'notes')"
+              ref="notes"
+              data-cy="notes"
+              @input="fieldValueChanged('notes')"
+              auto-grow
+            ></v-textarea>
+          </v-col>
+
+          <v-col v-if="form().showMe(this, 'Tags')" cols="12">
+            <gz-tag-picker
+              v-model="obj.tags"
+              :readonly="formState.readOnly"
+              ref="tags"
+              data-cy="tags"
+              :error-messages="form().serverErrors(this, 'tags')"
+              @input="fieldValueChanged('tags')"
+            ></gz-tag-picker>
+          </v-col>
+
+          <v-col cols="12">
+            <gz-custom-fields
+              v-model="obj.customFields"
+              :form-key="formCustomTemplateKey"
+              :readonly="formState.readOnly"
+              :parent-v-m="this"
+              ref="customFields"
+              data-cy="customFields"
+              :error-messages="form().serverErrors(this, 'customFields')"
+              @input="fieldValueChanged('customFields')"
+            ></gz-custom-fields>
+          </v-col>
+
+          <v-col v-if="form().showMe(this, 'Wiki')" cols="12">
+            <gz-wiki
+              :aya-type="ayaType"
+              :aya-id="obj.id"
+              ref="wiki"
+              v-model="obj.wiki"
+              :readonly="formState.readOnly"
+              @input="fieldValueChanged('wiki')"
+            ></gz-wiki
+          ></v-col>
+
+          <v-col v-if="form().showMe(this, 'Attachments') && obj.id" cols="12">
+            <gz-attachments
+              :readonly="formState.readOnly"
+              :aya-type="ayaType"
+              :aya-id="obj.id"
+            ></gz-attachments
+          ></v-col>
+        </v-row>
+      </v-form>
+    </div>
+    <template v-if="!formState.ready">
+      <v-progress-circular
+        indeterminate
+        color="primary"
+        :size="60"
+      ></v-progress-circular>
+    </template>
+  </div>
+</template>
+
+<script>
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/*  Xeslint-disable    */
+//
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+const FORM_KEY = "contract-edit";
+const API_BASE_URL = "contract/";
+const FORM_CUSTOM_TEMPLATE_KEY = "Contract"; //<-- Should always be CoreBizObject AyaType name here where possible
+
+export default {
+  async created() {
+    let vm = this;
+
+    try {
+      await initForm(vm);
+
+      vm.rights = window.$gz.role.getRights(window.$gz.type.Contract);
+      vm.formState.readOnly = !vm.rights.change;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+
+      //id 0 means create a new record don't load one
+      if (vm.$route.params.recordid != 0) {
+        //is there already an obj from a prior operation?
+        if (this.$route.params.obj) {
+          //yes, no need to fetch it
+          this.obj = this.$route.params.obj;
+          window.$gz.form.setFormState({
+            vm: vm,
+            loading: false
+          });
+        } else {
+          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+        }
+      } else {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+      window.$gz.form.setFormState({
+        vm: vm,
+        dirty: false,
+        valid: true
+      });
+
+      generateMenu(vm);
+    } catch (error) {
+      window.$gz.errorHandler.handleFormError(error, vm);
+    } finally {
+      vm.formState.ready = true;
+    }
+  },
+  async beforeRouteLeave(to, from, next) {
+    if (!this.formState.dirty || JUST_DELETED) {
+      next();
+      return;
+    }
+    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
+      next();
+    } else {
+      next(false);
+    }
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      obj:
+        //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
+        //I.E. Serial, usertype fields, ACTIVE
+        //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
+        {
+          id: 0,
+          concurrency: 0,
+          name: null,
+          active: true,
+          notes: null,
+          wiki: null,
+          customFields: "{}",
+          tags: [],
+          responseTime: "00:00:00",
+          contractServiceRatesOnly: false,
+          contractTravelRatesOnly: false,
+          partsOverride: 0,
+          partsOverrideType: 1,
+          serviceRatesOverride: 0,
+          serviceRatesOverrideType: 1,
+          travelRatesOverride: 0,
+          travelRatesOverrideType: 1,
+          alertNotes: null,
+          serviceRateItems: [],
+          travelRateItems: [],
+          contractPartOverrideItems: [],
+          contractTravelRateOverrideItems: [],
+          contractServiceRateOverrideItems: []
+        },
+      formState: {
+        ready: false,
+        dirty: false,
+        valid: true,
+        readOnly: false,
+        loading: true,
+        errorBoxMessage: null,
+        appError: null,
+        serverError: {}
+      },
+      rights: window.$gz.role.defaultRightsObject(),
+      ayaType: window.$gz.type.Contract
+    };
+  },
+  //WATCHERS
+  watch: {
+    formState: {
+      handler: function(val) {
+        //,oldval is available here too if necessary
+        if (this.formState.loading) {
+          return;
+        }
+
+        //enable / disable save button
+        if (val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
+        } else {
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
+        }
+
+        //enable / disable duplicate / new button
+        if (!val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit(
+            "menu-enable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
+        } else {
+          window.$gz.eventBus.$emit(
+            "menu-disable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    canSave: function() {
+      return this.formState.valid && this.formState.dirty;
+    },
+    canDuplicate: function() {
+      return this.formState.valid && !this.formState.dirty;
+    },
+    ayaTypes: function() {
+      return window.$gz.type;
+    },
+    form() {
+      return window.$gz.form;
+    },
+    fieldValueChanged(ref) {
+      if (
+        this.formState.ready &&
+        !this.formState.loading &&
+        !this.formState.readOnly
+      ) {
+        window.$gz.form.fieldValueChanged(this, ref);
+      }
+    },
+    async getDataFromApi(recordId) {
+      let vm = this;
+      window.$gz.form.setFormState({
+        vm: vm,
+        loading: true
+      });
+      if (!recordId) {
+        throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
+      }
+      let url = API_BASE_URL + recordId;
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+
+        let res = await window.$gz.api.get(url);
+
+        if (res.error) {
+          //Not found?
+          if (res.error.code == "2010") {
+            window.$gz.form.handleObjectNotFound(vm);
+          }
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          vm.obj = res.data;
+          //modify the menu as necessary
+          generateMenu(vm);
+          //Update the form status
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true,
+            loading: false
+          });
+        }
+      } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, vm);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+    },
+    async submit() {
+      let vm = this;
+      if (vm.canSave == false) {
+        return;
+      }
+
+      try {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: true
+        });
+        let url = API_BASE_URL; // + vm.$route.params.recordid;
+        //clear any errors vm might be around from previous submit
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+
+        let res = await window.$gz.api.upsert(url, vm.obj);
+
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
+          if (res.data.id) {
+            //POST - whole new object returned
+            vm.obj = res.data;
+            //Change URL to new record
+            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
+
+            this.$router.push({
+              name: "contract-edit",
+              params: {
+                recordid: res.data.id,
+                obj: res.data // Pass data object to new form
+              }
+            });
+          } else {
+            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
+            //Handle "put" of an existing record (UPDATE)
+            vm.obj.concurrency = res.data.concurrency;
+          }
+          //Update the form status
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true
+          });
+        }
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+    },
+    async remove() {
+      let vm = this;
+      try {
+        let dialogResult = await window.$gz.dialog.confirmDelete();
+        if (dialogResult != true) {
+          return;
+        }
+
+        //do the delete
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: true
+        });
+        //No need to delete a new record, just abandon it...
+        if (vm.$route.params.recordid == 0) {
+          //this should not get offered for delete but to be safe and clear just in case:
+          JUST_DELETED = true;
+          // navigate backwards
+          vm.$router.go(-1);
+        } else {
+          let url = API_BASE_URL + vm.$route.params.recordid;
+
+          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          let res = await window.$gz.api.remove(url);
+          if (res.error) {
+            vm.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(vm);
+          } else {
+            //workaround to prevent warning about leaving dirty record
+            //For some reason I couldn't just reset isdirty in formstate
+            JUST_DELETED = true;
+            // navigate backwards
+            vm.$router.go(-1);
+          }
+        }
+      } catch (error) {
+        //Update the form status
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
+    },
+    async duplicate() {
+      let vm = this;
+      if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
+        return;
+      }
+      window.$gz.form.setFormState({
+        vm: vm,
+        loading: true
+      });
+      let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
+
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+        let res = await window.$gz.api.upsert(url);
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          //Navigate to new record
+          this.$router.push({
+            name: "contract-edit",
+            params: {
+              recordid: res.data.id,
+              obj: res.data // Pass data object to new form
+            }
+          });
+        }
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+    }
+    //end methods
+  }
+};
+
+/////////////////////////////
+//
+//
+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 "save":
+        m.vm.submit();
+        break;
+      case "delete":
+        m.vm.remove();
+        break;
+      case "new":
+        m.vm.$router.push({
+          name: "contract-edit",
+          params: { recordid: 0, new: true }
+        });
+        break;
+      case "duplicate":
+        m.vm.duplicate();
+        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.Contract }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open({
+            ObjectType: window.$gz.type.Contract,
+            selectedRowIds: [m.vm.obj.id]
+          });
+
+          //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.Contract }
+          });
+        }
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: false,
+    readOnly: vm.formState.readOnly,
+    icon: "$ayiFileContract",
+    title: "Contract",
+    helpUrl: "svc-contracts",
+    formData: {
+      ayaType: window.$gz.type.Contract,
+      recordId: vm.$route.params.recordid,
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      recordName: vm.obj.name
+    },
+    menuItems: []
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "Save",
+      icon: "$ayiSave",
+      surface: true,
+      key: FORM_KEY + ":save",
+      vm: vm
+    });
+  }
+
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$ayiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      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
+    });
+  }
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$ayiPlus",
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "Duplicate",
+      icon: "$ayiClone",
+      key: FORM_KEY + ":duplicate",
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+
+let JUST_DELETED = false;
+
+/////////////////////////////////
+//
+//
+async function initForm(vm) {
+  await fetchTranslatedText(vm);
+  await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY);
+}
+
+//////////////////////////////////////////////////////////
+//
+// Ensures UI translated text is available
+//
+async function fetchTranslatedText(vm) {
+  await window.$gz.translation.cacheTranslations([
+    "Contract",
+    "ContractName",
+    "ContractNotes",
+
+    "ContractCustom1",
+    "ContractCustom2",
+    "ContractCustom3",
+    "ContractCustom4",
+    "ContractCustom5",
+    "ContractCustom6",
+    "ContractCustom7",
+    "ContractCustom8",
+    "ContractCustom9",
+    "ContractCustom10",
+    "ContractCustom11",
+    "ContractCustom12",
+    "ContractCustom13",
+    "ContractCustom14",
+    "ContractCustom15",
+    "ContractCustom16"
+  ]);
+}
+</script>
diff --git a/ayanova/src/views/svc-contracts.vue b/ayanova/src/views/svc-contracts.vue
index 913590b0..3b553134 100644
--- a/ayanova/src/views/svc-contracts.vue
+++ b/ayanova/src/views/svc-contracts.vue
@@ -1,21 +1,167 @@
 <template>
-  <UnderConstruction data-cy="underconstruction" />
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :aya-type="ayType"
+      :selected-items="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      form-key="contract-list"
+      data-list-key="ContractDataList"
+      :show-select="rights.read"
+      :reload="reload"
+      @selection-change="handleSelected"
+      data-cy="contractsTable"
+    >
+    </gz-data-table>
+  </div>
 </template>
 
 <script>
-import UnderConstruction from "../components/underconstruction.vue";
-
+const FORM_KEY = "contract-list";
 export default {
-  components: {
-    UnderConstruction
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.Contract);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
   },
-  beforeCreate() {
-    window.$gz.eventBus.$emit("menu-change", {
-      isMain: true,
-      icon: "$ayiFileContract",
-      title: "ContractList",
-      helpUrl: "svc-contracts"
-    });
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      ayType: window.$gz.type.Contract,
+      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: "contract-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Contract)
+        );
+        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.Contract }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.Contract
+            )
+          );
+
+          //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.Contract }
+          });
+        }
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiFileContract",
+    title: "ContractList",
+    helpUrl: "svc-contracts",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.Contract
+    }
+  };
+
+  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>
diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js
index 20aa538d..a307b467 100644
--- a/ayanova/tests/e2e/specs/smoke.js
+++ b/ayanova/tests/e2e/specs/smoke.js
@@ -137,7 +137,7 @@ describe("SMOKE", () => {
 
     cy.visit("/svc-contracts");
     cy.url().should("include", "/svc-contracts");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=contractsTable]");
 
     cy.visit("/svc-projects");
     cy.url().should("include", "/svc-projects");
@@ -334,10 +334,7 @@ describe("SMOKE", () => {
     cy.get("[data-cy=customizeForm]");
 
     cy.visit("/data-list-column-view/TestWidgetDataList");
-    cy.url().should(
-      "include",
-      "/data-list-column-view/TestWidgetDataList"
-    );
+    cy.url().should("include", "/data-list-column-view/TestWidgetDataList");
     cy.get("[data-cy=dlcForm]");
 
     cy.visit("/home-reviews/2/1");