Yep. I'll submit another PR when ready.