Trackmaster 2 Motor Swap- Help

I agree- the music was a nice touch

Anyway, I tried reassembling him- no luck. the switch seems to be the issue though- its not making a clear shift between "on" and "off" like it's supposed to- just kind of sliding rather than making a good positive connection. any other ideas?

EDIT- the drive gear is also spinning freely