@nprofile1q... It'll be ready for a futureproof and elegant solution in a couple more refactors