Collapse and refactor, Ride index V2
Refactor.
Updates

Change to use new ride index view, package updates.