I agree, I will break this out into a separate pull request.