I've got this change ready to go, but I'm going to wait until after the voting period is over as it somewhat fundamentally changes the game. Thanks for the advice!
