Fixing all of the things I broke