diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 0a279c6d..f9b72677 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -77,6 +77,8 @@ DONE: Turn widget edit ROLES into a static select populated from server
 	- Use the enumpicklist route to get a list of roles and use it for the widget UI	
 DONE: Widget - NOTES FIELD 
 TODO: TAGS!!! Do tags mofo
+	- https://stackoverflow.com/questions/48500587/vuetify-v0-17-6-how-to-get-the-autocomplete-text-inside-v-select
+	- 
 TODO: Custom fields
 TODO: Record history display / check other AyaNova 7 options / buttons that need to carry forward
 	- Some of this stuff is stage 2 for the edit form
diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index 2fbfb321..7e31a8c4 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -97,7 +97,8 @@ export default {
     "DeletePrompt",
     "AreYouSureUnsavedChanges",
     "Leave",
-    "Copy"
+    "Copy",
+    "Tags"
   ],
   decimalValidate(required) {
     return { required: required, decimal: [2, this.format().decimalSeparator] };
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index 87d6f1fb..f3b69ceb 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -138,6 +138,20 @@
               @change="onChange('roles')"
             ></v-select>
           </v-flex>
+          <v-flex xs12 px-2>
+            <v-autocomplete
+              v-model="obj.tags"
+              :readonly="this.formState.readOnly"
+              :label="this.$gzlocale.get('Tags')"
+              :error-messages="this.$gzform.serverErrors(this, 'tags')"
+              ref="tags"
+              @change="onChange('tags')"
+              :items="pickLists.tags"
+              :loading="tagSearchUnderway"
+              :search-input.sync="searchTags"
+              chips
+            ></v-autocomplete>
+          </v-flex>
           <v-flex xs12 px-2>
             <v-textarea
               v-model="obj.notes"
@@ -147,7 +161,6 @@
               ref="notes"
               @change="onChange('notes')"
               auto-grow
-              outline
             ></v-textarea>
           </v-flex>
         </v-layout>
@@ -173,7 +186,7 @@
 
 <script>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*  Xeslint-disable    */
+/*  eslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 const FORM_KEY = "inventory-widget-edit";
@@ -256,8 +269,11 @@ export default {
   data() {
     return {
       pickLists: {
-        roles: []
+        roles: [],
+        tags: []
       },
+      searchTags: null,
+      tagSearchUnderway: false,
       obj: {
         id: 0,
         concurrencyToken: 0,
@@ -312,6 +328,27 @@ export default {
         }
       },
       deep: true
+    },
+    searchTags(val) {
+      var vm = this;
+
+      if (vm.tagSearchUnderway) {
+        return;
+      }
+      vm.tagSearchUnderway = true;
+
+      vm.$gzapi
+        .get("TagList/picklist?query=" + val) //roles
+        .then(res => {
+          if (res.error) {
+            throw res.error;
+          }
+          vm.pickLists.tags = res.data;
+          vm.tagSearchUnderway = false;
+        })
+        .catch(err => {
+          vm.$gzHandleFormError(err);
+        });
     }
   },
   computed: {