Pickup/Drop off points done

And tested