Your welcome to add this as a subsequent PR, or combine it with this one.