Work on new editor