ProposalContacts refactored to be a bit more functional