Billing fully functional
Merge branch 'master' of https://github.com/kmansingh3/4400