WIP on restructuring to be less intrusive

Discuss.