Would love a PR with this!