Energy modelling (24/32)

Energy modelling