@aled96 can you work on the above based on the mass sent by Lorenzo? Please create a branch and tomorrow we can do a PR.