All the CurrentAndPending or CurrentProposal type classes.  Are they related to prop dev?  Should they be move into some kind of CurrentAndPending or CurrentProposal type package?