I will just keep posting my various work here for now.
...
No urgency to merge, best to do it before doing our manual testing protocol