Override the thing, it seems to actually work!
Cleans some up, moves stuff around, seems to still work