Add voting

have fun merging this one helen!
Line is too long. [94/80]