This is done now so I’ve closed this topic to return everyone’s votes. There’s more details about the solution here -