Billing

Better handling of past class transfers