refactor, attempt to add bills