New billing

# Work in progress

Opening this now so we can discuss the implementation. If anyone cares.