Collection edit view work in progress - needs tests