[WIP] Reduce interdepenencies

Resurrecting this from a stash where I was experimenting since Kevin was mentioning similar stuff.