outsource some more voter code