Ch.13-14 WIP on reworking probability package to be more type safe