I like this idea, but I would prefer if it were in a separate pull request.