Add voting

have fun merging this one helen!
Remove commented code