Should be all clean and ready to go now.

Fucking 23 commits holy shit I'm so good at this