Nice job! I, too, am one who prefers to tinker and upgrade what I already have rather than buy something different. I have an older Athearn TR5-A switch engine I'll have to re-motor someday. The open frame motor just draws too much current. Decoders don't take kindly to that!