move NextStop to own file