A whole new...pull request

Don't fuck it up this time.