Bus refactor modifications
More tests
Smart hosts.