changed to use local for the proposal
added switch for local vs private proposal
moved a few definitions to constants, where they belonged in the first place