Well done. It might be good to add minor parties and independants if they have a stake in a race on the ballot.