diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 8e2e5e48..58005ffe 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -130,6 +130,8 @@ export default {
     }
   },
   methods: {
+    //Get full selection for use on forms where we need the
+    //full selection including name, active, id
     getFullSelectionValue() {
       return this.lastSelection;
     },
diff --git a/ayanova/src/views/inv-part-assembly.vue b/ayanova/src/views/inv-part-assembly.vue
index f1dd9890..95d7adb8 100644
--- a/ayanova/src/views/inv-part-assembly.vue
+++ b/ayanova/src/views/inv-part-assembly.vue
@@ -19,6 +19,15 @@
           </v-col>
 
           <v-col cols="12">
+            <gz-pick-list
+              v-if="!formState.readOnly"
+              :ayaType="ayaTypes().Part"
+              :showEditIcon="true"
+              :label="$ay.t('Part')"
+              ref="partId"
+              data-cy="partId"
+              @input="addItem()"
+            ></gz-pick-list>
             <v-simple-table>
               <template v-slot:default>
                 <thead>
@@ -264,7 +273,8 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      ayaType: window.$gz.type.PartAssembly
+      ayaType: window.$gz.type.PartAssembly,
+      selectedPart: null
     };
   },
   //WATCHERS
@@ -302,8 +312,32 @@ export default {
     }
   },
   methods: {
+    addItem: function() {
+      let vm = this;
+      let selected = vm.$refs.partId.getFullSelectionValue();
+      if (selected == null) {
+        return;
+      }
+      let index = vm.obj.items.findIndex(z => z.partId == selected.id);
+      if (index != -1) {
+        //already in the list
+        return;
+      }
+
+      vm.obj.items.push({
+        partAssemblyId: vm.obj.id,
+        partId: selected.id,
+        partDisplay: selected.name
+      });
+    },
     removeItem: function(item) {
-      console.log(item);
+      let vm = this;
+      let index = vm.obj.items.findIndex(z => z.partId == item.partId);
+      if (index == -1) {
+        return;
+      }
+      vm.obj.items.splice(index, 1);
+      vm.formState.dirty = true;
     },
     canSave: function() {
       return this.formState.valid && this.formState.dirty;