Work on #8, Package modelling