I think you may be right about the chassis swap, I've tried but I think mine is shot. ANd yes I do love my Gen 2. It was the second trainset I ever got as a kid and she's joining my garden railroad roster as my #2 hauler so a lot of shell modification work is underway, just needed to figure out the mechanical issues. And that thread is really detailed, bookmarking that for future reference, Thanks so much for your help and Input~!