Nice!
I can probably tackle this on sunday, but if someone wants to beat me to it I certainly would not object
