WIP: structure of Modelling
merge