Some progress on the editor
Merge