Feature/make the simple editor really simple after all/324