Fill out the candidate skeleton more, add timeout facilities
Merge branch 'feature-add-timeout-and-fillout-skeleton'