Bus: updating API with new model.

Still have to update comments and client code