add specs and dont use partial for upcoming_stops