Put in votes. Also tidied up some stuff

Shouldn't conflict with the addition