Validation/upscaling

Prototype is full scale, optimisation still in progress