Exchange model implementation #26 : thesis version. Test is green.