I changed a bunch of crap and hopefully didn't break anything
Hope it's not broken