+1 to switching this one around, otherwise ready to merge, I think.