Maybe move the call to ```validate_proposal``` here to decrease the current mess? :-)