Continued parameterisation/globalisation.
Completion of parameterisation and globalisation of functions.

Now ready to measure and optimise.