Clean: move new implementation into it's own file Might split it up further, but not needed for now Tests: editor compiles