[@TheMerlin]

Sounds good! 

I'll make those changes and move them over.