Work in editor

Fully working in-editor mode, replacing #178