moved bills to one model