Preparing to add minor billing functionality