Witch commit (WIP)
Witch progress
Minor resign tidy up
Apply vote locking when the witch plugin is doing its thing