More merge woes

(Will learn eventually)
Pulling "weighted vote" tallies to own functions