Add vote counting

This adds the counting of votes correctly, although they aren't displayed yet.