Fleshed out billing further