Finishing Off The Complete Roster Hack

I've been planning to take a look at that, actually, because I ran into the same problem with another patch. It's been a while, but if you want to talk through the code with someone, I'd be up for that - maybe we can solve it together?