various other changes,

Set up a framework for bill categorization