don't do this as follow up, it's part of doing this right, and not a lot of work, let's just add it in this pull