Started working on editor again