Continue Editor work.
Continue work on Editor.