Refactor also added in signalling for selecting a ride.