I moved this with my last commit, let me know what you think.