remove TODO from joyride.
Merge conflicts.