Definitely something that deserves its own PR.