stop adding shit that is stopping this from being merged and put it in a different pull request