Voting is functional again
Modified to fix conflicts