This is a massive commmit, sorry

I don't even know what's in here, cross your fingers!