More work on bulk edits