Energy modelling (31/32)

Energy modelling