WIP commit
Another WIP commit, interface experiments.
Manipulator works, refactoring necessary.