Cool. The PR looks good to me. Let me know when you're ready and I'll merge it.