added in greg's voting
integrating Greg's voting though it doesn't quite work yet