Dev

All but 11 commits disappeared from my master branch, I don't understand anything and I'm pulling this in now because whatever, bro.