Pushing more Bus code. It's starting to get a shape.