Yes, but I'd like to tackle this sooner rather than later. I'll merge this PR for now.