diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index d6f83bc2..5e2e2d30 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -322,6 +322,12 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "svc" */ "./views/svc-units.vue")
     },
+    {
+      path: "/svc-units/:recordid",
+      name: "unit-edit",
+      component: () =>
+        import(/* webpackChunkName: "svc" */ "./views/svc-unit.vue")
+    },
     {
       path: "/svc-unit-models",
       name: "svc-unit-models",
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
new file mode 100644
index 00000000..49e727f6
--- /dev/null
+++ b/ayanova/src/views/svc-unit.vue
@@ -0,0 +1,1260 @@
+<template>
+  <v-container fluid>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <div v-if="formState.ready">
+      <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
+
+      <v-form ref="form">
+        <v-tabs mobile-breakpoint="100" v-model="tab">
+          <v-tab>{{ $ay.t("Unit") }}</v-tab>
+          <v-tab>{{ $ay.t("Address") }}</v-tab>
+          <v-tabs-items v-model="tab">
+            <v-tab-item class="mt-4">
+              <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('UnitName')"
+                    :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
+                  v-if="form().showMe(this, 'Active')"
+                  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, 'AccountNumber')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.accountNumber"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitAccountNumber')"
+                    ref="accountNumber"
+                    data-cy="accountNumber"
+                    :error-messages="form().serverErrors(this, 'accountNumber')"
+                    @input="fieldValueChanged('accountNumber')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'WebAddress')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-url
+                    v-model="obj.webAddress"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('WebAddress')"
+                    ref="webAddress"
+                    data-cy="webAddress"
+                    :error-messages="form().serverErrors(this, 'webAddress')"
+                    @input="fieldValueChanged('webAddress')"
+                  ></gz-url>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Contact')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.contact"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitContact')"
+                    ref="contact"
+                    data-cy="contact"
+                    :error-messages="form().serverErrors(this, 'contact')"
+                    @input="fieldValueChanged('contact')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'EmailAddress')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-email
+                    v-model="obj.emailAddress"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitEmail')"
+                    ref="emailAddress"
+                    data-cy="emailAddress"
+                    :error-messages="form().serverErrors(this, 'emailAddress')"
+                    @input="fieldValueChanged('emailAddress')"
+                  ></gz-email>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Phone1')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-phone
+                    v-model="obj.phone1"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitPhone1')"
+                    ref="phone1"
+                    data-cy="phone1"
+                    :error-messages="form().serverErrors(this, 'phone1')"
+                    @input="fieldValueChanged('phone1')"
+                  ></gz-phone>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Phone2')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-phone
+                    v-model="obj.phone2"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitPhone2')"
+                    ref="phone2"
+                    data-cy="phone2"
+                    :error-messages="form().serverErrors(this, 'phone2')"
+                    @input="fieldValueChanged('phone2')"
+                  ></gz-phone>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Phone3')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-phone
+                    v-model="obj.phone3"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitPhone3')"
+                    ref="phone3"
+                    data-cy="phone3"
+                    :error-messages="form().serverErrors(this, 'phone3')"
+                    @input="fieldValueChanged('phone3')"
+                  ></gz-phone>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Phone4')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-phone
+                    v-model="obj.phone4"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitPhone4')"
+                    ref="phone4"
+                    data-cy="phone4"
+                    :error-messages="form().serverErrors(this, 'phone4')"
+                    @input="fieldValueChanged('phone4')"
+                  ></gz-phone>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Phone5')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-phone
+                    v-model="obj.phone5"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitPhone5')"
+                    ref="phone5"
+                    data-cy="phone5"
+                    :error-messages="form().serverErrors(this, 'phone5')"
+                    @input="fieldValueChanged('phone5')"
+                  ></gz-phone>
+                </v-col>
+
+                <!-- --------------------------------- -->
+                <v-col v-if="form().showMe(this, 'Notes')" cols="12">
+                  <v-textarea
+                    v-model="obj.notes"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitNotes')"
+                    :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, 'ContactNotes')" cols="12">
+                  <v-textarea
+                    v-model="obj.contactNotes"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitContactNotes')"
+                    :error-messages="form().serverErrors(this, 'contactNotes')"
+                    ref="contactNotes"
+                    data-cy="contactNotes"
+                    @input="fieldValueChanged('contactNotes')"
+                    auto-grow
+                    prepend-icon="$ayiUser"
+                  ></v-textarea>
+                </v-col>
+
+                <v-col v-if="form().showMe(this, 'PopUpNotes')" cols="12">
+                  <v-textarea
+                    v-model="obj.popUpNotes"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitPopUpNotes')"
+                    :error-messages="form().serverErrors(this, 'popUpNotes')"
+                    ref="popUpNotes"
+                    data-cy="popUpNotes"
+                    @input="fieldValueChanged('popUpNotes')"
+                    auto-grow
+                    prepend-icon="$ayiExclamationCircle"
+                    color="accent"
+                  ></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"
+                    :formKey="formCustomTemplateKey"
+                    :readonly="formState.readOnly"
+                    :parentVM="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
+                    :ayaType="ayaType"
+                    :ayaId="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"
+                    :ayaType="ayaType"
+                    :ayaId="obj.id"
+                  ></gz-attachments
+                ></v-col>
+              </v-row>
+            </v-tab-item>
+            <v-tab-item class="mt-4">
+              <v-row>
+                <v-col cols="12">
+                  <v-menu offset-y v-if="rights.change">
+                    <template v-slot:activator="{ on, attrs }">
+                      <span class="text-h6">
+                        {{ $ay.t("AddressTypePhysical") }}</span
+                      ><v-btn icon v-bind="attrs" v-on="on">
+                        <v-icon small>$ayiEllipsisV</v-icon>
+                      </v-btn>
+                    </template>
+                    <v-list>
+                      <v-list-item @click="AddressCopyPhysicalToClipBoard()">
+                        <v-list-item-icon>
+                          <v-icon>$ayiCopy</v-icon>
+                        </v-list-item-icon>
+                        <v-list-item-title>{{
+                          $ay.t("CopyToClipboard")
+                        }}</v-list-item-title>
+                      </v-list-item>
+                      <v-list-item @click="AddressCopyToPostal">
+                        <v-list-item-icon>
+                          <v-icon>$ayiClone</v-icon>
+                        </v-list-item-icon>
+                        <v-list-item-title>{{
+                          $ay.t("AddressCopyToPostal")
+                        }}</v-list-item-title>
+                      </v-list-item>
+                      <v-list-item @click="GeoCapture">
+                        <v-list-item-icon>
+                          <v-icon>$ayiMapMarker</v-icon>
+                        </v-list-item-icon>
+                        <v-list-item-title>{{
+                          $ay.t("GeoCapture")
+                        }}</v-list-item-title>
+                      </v-list-item>
+                    </v-list>
+                  </v-menu>
+                  <span class="text-h6" v-else>
+                    {{ $ay.t("AddressTypePhysical") }}</span
+                  >
+                </v-col>
+                <v-col
+                  v-if="form().showMe(this, 'Address')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.address"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressDeliveryAddress')"
+                    ref="address"
+                    data-cy="address"
+                    :error-messages="form().serverErrors(this, 'address')"
+                    @input="fieldValueChanged('address')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'City')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.city"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressCity')"
+                    ref="city"
+                    data-cy="city"
+                    :error-messages="form().serverErrors(this, 'city')"
+                    @input="fieldValueChanged('city')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Region')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.region"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressStateProv')"
+                    ref="region"
+                    data-cy="region"
+                    :error-messages="form().serverErrors(this, 'region')"
+                    @input="fieldValueChanged('region')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Country')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.country"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressCountry')"
+                    ref="country"
+                    data-cy="country"
+                    :error-messages="form().serverErrors(this, 'country')"
+                    @input="fieldValueChanged('country')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Latitude')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-decimal
+                    v-model="obj.latitude"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressLatitude')"
+                    ref="latitude"
+                    data-cy="latitude"
+                    :rules="[form().decimalValid(this, 'latitude')]"
+                    :error-messages="form().serverErrors(this, 'latitude')"
+                    @input="fieldValueChanged('latitude')"
+                    :precision="6"
+                  ></gz-decimal>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'Longitude')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-decimal
+                    v-model="obj.longitude"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressLongitude')"
+                    ref="longitude"
+                    data-cy="longitude"
+                    :rules="[form().decimalValid(this, 'longitude')]"
+                    :error-messages="form().serverErrors(this, 'longitude')"
+                    @input="fieldValueChanged('longitude')"
+                    :precision="6"
+                  ></gz-decimal>
+                </v-col>
+
+                <v-col cols="12">
+                  <v-menu offset-y v-if="rights.change">
+                    <template v-slot:activator="{ on, attrs }">
+                      <span class="text-h6">
+                        {{ $ay.t("AddressTypePostal") }}</span
+                      ><v-btn icon v-bind="attrs" v-on="on">
+                        <v-icon small>$ayiEllipsisV</v-icon>
+                      </v-btn>
+                    </template>
+                    <v-list>
+                      <v-list-item @click="AddressCopyPostalToClipBoard()">
+                        <v-list-item-icon>
+                          <v-icon>$ayiCopy</v-icon>
+                        </v-list-item-icon>
+                        <v-list-item-title>{{
+                          $ay.t("CopyToClipboard")
+                        }}</v-list-item-title>
+                      </v-list-item>
+                      <v-list-item @click="AddressCopyToPhysical">
+                        <v-list-item-icon>
+                          <v-icon>$ayiClone</v-icon>
+                        </v-list-item-icon>
+                        <v-list-item-title>{{
+                          $ay.t("AddressCopyToPostal")
+                        }}</v-list-item-title>
+                      </v-list-item>
+                    </v-list>
+                  </v-menu>
+                  <span class="text-h6" v-else>
+                    {{ $ay.t("AddressTypePhysical") }}</span
+                  >
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'PostAddress')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.postAddress"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostalDeliveryAddress')"
+                    ref="postAddress"
+                    data-cy="postAddress"
+                    :error-messages="form().serverErrors(this, 'postAddress')"
+                    @input="fieldValueChanged('postAddress')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'PostCity')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.postCity"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostalCity')"
+                    ref="postCity"
+                    data-cy="postCity"
+                    :error-messages="form().serverErrors(this, 'postCity')"
+                    @input="fieldValueChanged('postCity')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'PostRegion')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.postRegion"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostalStateProv')"
+                    ref="postRegion"
+                    data-cy="postRegion"
+                    :error-messages="form().serverErrors(this, 'postRegion')"
+                    @input="fieldValueChanged('postRegion')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'PostCountry')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.postCountry"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostalCountry')"
+                    ref="postCountry"
+                    data-cy="postCountry"
+                    :error-messages="form().serverErrors(this, 'postCountry')"
+                    @input="fieldValueChanged('postCountry')"
+                  ></v-text-field>
+                </v-col>
+
+                <v-col
+                  v-if="form().showMe(this, 'PostCode')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    v-model="obj.postCode"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostalPostal')"
+                    ref="postCode"
+                    data-cy="postCode"
+                    :error-messages="form().serverErrors(this, 'postCode')"
+                    @input="fieldValueChanged('postCode')"
+                  ></v-text-field>
+                </v-col>
+              </v-row>
+            </v-tab-item>
+          </v-tabs-items>
+        </v-tabs>
+      </v-form>
+    </div>
+    <template v-if="!formState.ready">
+      <v-progress-circular
+        indeterminate
+        color="primary"
+        :size="60"
+      ></v-progress-circular>
+    </template>
+  </v-container>
+</template>
+
+<script>
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/*  Xeslint-disable    */
+//
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+const FORM_KEY = "unit-edit";
+const API_BASE_URL = "unit/";
+const FORM_CUSTOM_TEMPLATE_KEY = "Unit"; //<-- 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.Unit);
+      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: [],
+          webAddress: null,
+          popUpNotes: null,
+          contactNotes: null,
+          contact: null,
+          accountNumber: null,
+          phone1: null,
+          phone2: null,
+          phone3: null,
+          phone4: null,
+          phone5: null,
+          emailAddress: null,
+          postAddress: null,
+          postCity: null,
+          postRegion: null,
+          postCountry: null,
+          postCode: null,
+          address: null,
+          city: null,
+          region: null,
+          country: null,
+          latitude: null,
+          longitude: null
+        },
+      tab: 0,
+      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.Unit
+    };
+  },
+  //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: "unit-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: "unit-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
+        });
+      }
+    },
+
+    AddressCopyToPostal() {
+      let vm = this;
+      vm.obj.postAddress = vm.obj.address;
+      vm.obj.postCity = vm.obj.city;
+      vm.obj.postRegion = vm.obj.region;
+      vm.obj.postCountry = vm.obj.country;
+    },
+    AddressCopyToPhysical() {
+      let vm = this;
+      vm.obj.address = vm.obj.postAddress;
+      vm.obj.city = vm.obj.postCity;
+      vm.obj.region = vm.obj.postRegion;
+      vm.obj.country = vm.obj.postCountry;
+    },
+    AddressCopyPhysicalToClipBoard() {
+      let vm = this;
+      let ret = "";
+      if (vm.obj.name) {
+        ret += vm.obj.name + "\n";
+      }
+      if (vm.obj.address) {
+        ret += vm.obj.address + "\n";
+      }
+
+      if (vm.obj.city) {
+        ret += vm.obj.city + " ";
+      }
+
+      if (vm.obj.region) {
+        ret += vm.obj.region + " ";
+      }
+
+      if (vm.obj.country) {
+        ret += vm.obj.country + "\n";
+      }
+      window.$gz.util.copyToClipboard(ret);
+    },
+    AddressCopyPostalToClipBoard() {
+      let vm = this;
+      let ret = "";
+      if (vm.obj.name) {
+        ret += vm.obj.name + "\n";
+      }
+      if (vm.obj.postAddress) {
+        ret += vm.obj.postAddress + "\n";
+      }
+
+      if (vm.obj.postCity) {
+        ret += vm.obj.postCity + " ";
+      }
+
+      if (vm.obj.postRegion) {
+        ret += vm.obj.postRegion + " ";
+      }
+
+      if (vm.obj.postCode) {
+        //Postal codes should have two spaces before them according to regs.
+        ret += "  " + vm.obj.postCode + "\n";
+      }
+
+      if (vm.obj.postCountry) {
+        ret += vm.obj.postCountry + "\n";
+      }
+      window.$gz.util.copyToClipboard(ret);
+    },
+    async GeoCapture() {
+      let vm = this;
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+        let loc = await window.$gz.util.getGeoLocation();
+        vm.obj.latitude = loc.latitude;
+        vm.fieldValueChanged("latitude");
+        vm.obj.longitude = loc.longitude;
+        vm.fieldValueChanged("longitude");
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      }
+    }
+
+    //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: "unit-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.Unit }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open({
+            ObjectType: window.$gz.type.Unit,
+            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.Unit }
+          });
+        }
+        break;
+
+      case "geoview":
+        window.$gz.util.viewGeoLocation({
+          latitude: m.vm.obj.latitude,
+          longitude: m.vm.obj.longitude,
+          address: m.vm.obj.address || m.vm.obj.postAddress,
+          city: m.vm.obj.city || m.vm.obj.postCity,
+          region: m.vm.obj.region || m.vm.obj.postRegion,
+          country: m.vm.obj.country || m.vm.obj.postCountry,
+          postCode: m.vm.obj.postCode
+        });
+        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: "$ayiFan",
+    title: "Unit",
+    helpUrl: "form-svc-units",
+    formData: {
+      ayaType: window.$gz.type.Unit,
+      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 });
+
+  menuOptions.menuItems.push({
+    title: "GeoView",
+    icon: "$ayiMapMarked",
+    key: FORM_KEY + ":geoview",
+    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([
+    "Unit",
+    "UnitName",
+    "UnitNotes",
+    "WebAddress",
+    "UnitPopUpNotes",
+    "UnitAccountNumber",
+    "UnitContact",
+    "UnitContactNotes",
+    "UnitPhone1",
+    "UnitPhone2",
+    "UnitPhone3",
+    "UnitPhone4",
+    "UnitPhone5",
+    "UnitEmail",
+    "AddressTypePhysical",
+    "AddressTypePostal",
+    "AddressCopyToPostal",
+    "AddressCopyToPhysical",
+    "Address",
+    "AddressPostalDeliveryAddress",
+    "AddressPostalCity",
+    "AddressPostalStateProv",
+    "AddressPostalCountry",
+    "AddressPostalPostal",
+    "AddressDeliveryAddress",
+    "AddressCity",
+    "AddressStateProv",
+    "AddressCountry",
+    "AddressLatitude",
+    "AddressLongitude",
+    "UnitCustom1",
+    "UnitCustom2",
+    "UnitCustom3",
+    "UnitCustom4",
+    "UnitCustom5",
+    "UnitCustom6",
+    "UnitCustom7",
+    "UnitCustom8",
+    "UnitCustom9",
+    "UnitCustom10",
+    "UnitCustom11",
+    "UnitCustom12",
+    "UnitCustom13",
+    "UnitCustom14",
+    "UnitCustom15",
+    "UnitCustom16"
+  ]);
+}
+</script>
diff --git a/ayanova/src/views/svc-units.vue b/ayanova/src/views/svc-units.vue
index 78f1c493..7db03707 100644
--- a/ayanova/src/views/svc-units.vue
+++ b/ayanova/src/views/svc-units.vue
@@ -1,21 +1,171 @@
 <template>
-  <UnderConstruction data-cy="underconstruction" />
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <gz-extensions
+      :ayaType="ayType"
+      :selectedItems="selectedItems"
+      ref="extensions"
+    >
+    </gz-extensions>
+    <gz-data-table
+      ref="gzdatatable"
+      formKey="unit-list"
+      :dataListKey="dataListKey"
+      :dataListFilter="dataListFilter"
+      :dataListSort="dataListSort"
+      :showSelect="rights.read"
+      :reload="reload"
+      v-on:selection-change="handleSelected"
+      data-cy="unitsTable"
+    >
+    </gz-data-table>
+  </div>
 </template>
 
 <script>
-import UnderConstruction from "../components/underconstruction.vue";
-
+const FORM_KEY = "unit-list";
 export default {
-  components: {
-    UnderConstruction
+  created() {
+    this.rights = window.$gz.role.getRights(window.$gz.type.Unit);
+    window.$gz.eventBus.$on("menu-click", clickHandler);
+    generateMenu(this);
   },
-  beforeCreate() {
-    window.$gz.eventBus.$emit("menu-change", {
-      isMain: true,
-      icon: "$ayiFan",
-      title: "UnitList",
-      helpUrl: "form-svc-units"
-    });
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      currentListViewId: 1,
+      dataListKey: "UnitDataList",
+      dataListFilter: "",
+      dataListSort: "",
+      rights: window.$gz.role.defaultRightsObject(),
+      ayType: window.$gz.type.Unit,
+      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: "unit-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "extensions":
+        let res = await m.vm.$refs.extensions.open(
+          m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Unit)
+        );
+        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.Unit }
+          });
+        } else {
+          //general report selector chosen
+
+          let res = await m.vm.$refs.reportSelector.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.Unit)
+          );
+
+          //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.Unit }
+          });
+        }
+        break;
+
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: true,
+    icon: "$ayiFan",
+    title: "UnitList",
+    helpUrl: "form-svc-units",
+    menuItems: [],
+    formData: {
+      ayaType: window.$gz.type.Unit
+    }
+  };
+
+  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>