Yea, but I want to do that in a separate commit. I can work on that tomorrow.