quick pull from tgmaster to try and work on these fucking conflicts

NOTHING WORKS, SOLID FACT.