Going to turn this into a different feature branch, but excellent idea.