Progress on editor