Moved editor functions. Added TODOs for #67.