2124: New billing

Mostly complete, in QA now.