Added back in editing for now while working on reordering.