Works for me, so if you're happy I am too. I'll fix the minor indent during merge. I will need to get the rest of the crew to look at the MSF side though as I feel I'm not yet qualified to vet a PR for that :) Cheers!