Finalise WIP -- code working on CHPC.