WIP Cp add votes

Avoid using {...} for multi-line blocks.