Major work on billinghelper