fixed choochoo
Final Choo Choo fix.
Merge newchoochoo into master