domain: WIP do some cleanup

Domain#bind() shoved in too much. This helps break things out so I'll be
able to see what's going on.