Lots of work on the editor.