update to mapping, starting to refactor createBillingAgreements
update to mapping, starting to refactor createBillingAgreements