Not urgent. I'd like to defer until after #33 is merged because it refactors the editor pretty heavily.