ProposalCraftsmen refactored to a more functinal approach