Voting

Close #10 with these changes. They are nice.