Leader breaker

Depends on #215 - only the last commit actually belongs in this PR. I will rebase on master once that has been merged.