Adding a new voting order, and doing some minor refactoring