Initial work on the editor