Just for reference - do not merge

This is just for reference as to what has been done by cern.
This needs to be tidied up (and broken up( and made into a proper request(s). I should be able to get to it later this week.