Candidates

A proposed change to include a candidate list, as suggested in #196. Could be better, but it's a start.