Further modelling (& created dummy data generator)