Comment 18 for bug 1422379

This was heavily discussed at the Hack-a-way, and based on that, I am pulling it back to extend the billing data model a bit for even better flexibility. Expect an updated branch soon!