Fixing all of the brokenness

Arrrgghhhh GITHUB sucks sometimes