Finishing touches on candidate mode
Merge branch 'feature-candidate-mode'