Working on the editor