Some work on the voting feature.
Resolved a conflict.