Commiting half-way through factoring out billing agents.
Completed factoring into BillingAgents