Add behvaiours to support ending without being sold (before moving to FSM)
Merge remote-tracking branch 'origin/master'