Refactor to add minutes, bills, etc.