Began work on /stops and /arrivals