great, look forward to a better solution.
I’ll help in testing if you want.