Edit organization and first version of add/edit collection