Some work on editor.