working on adding the add-edit form
fixed merge conflicts
merged changes
fixed more merge conflicts