Add 'discard' phase & action, improvements in several places.
Continue implementing 'play' action.