Mostly speculative changes about how I think the architecture should look. Totally experimental and not safe for public consumption. If that didn't describe this entire project, I'd feel guilty about not forking into a separate repo first. Consider yourself warned.