I like this. Would take this in a separate pull.