WIP. Almost complete adaptation to new splitting/trade management strategy