wip editor.
Merge branch 'modules'

* modules:
  wip editor.