Updating my fork

If TG sees this, I fucked this up, so ignore it.