Joyride additions

Merging joyrides