Let's iterate on this in the next pull request