Continue working on editor