moved things around so that it is easier to start adding tests to voting...