Added some more behaviours and tried to get more work done on trading