API constraints has been moved to the Accounts, Billing should hold multiple tokens

However lots more work has to be done on the Billing
some more comments