Cleanup
Cleanup selection code
Adding candidates
Fixup version selecting