Added untested display_message ability
Merge branch 'trading_stage' into development