CPS and Metro agree on bus plan