Continuation of xxxWasSelected

Intended to continue/address conversation in #27.