Photo by a loves dc.

Free public wi-fi is coming to all Metro underground stations, officials announced today.

Already, riders can log on to that sweet, sweet internet at six Metro stops—Metro Center, Gallery Place, Judiciary Square, Union Station, Archives and L’Enfant Plaza—thanks to a pilot program that launched in August.

Metro General Manage Paul Wiedefeld’s decision to expand the program is “based on positive rider feedback,” according to a statement from the agency.

Metro says it will begin working on the expansion in the summer of 2017. The agency plans to get 60 percent of stations signed on by the end of the year, and complete the rest in 2018. It will release a more specific schedule for the installation in the new year.

The agency has also been working since February to install radio cable along 100 miles of tunnel walls throughout the rail system. The plan dates back to 2008, when Metro signed contracts signed with Verizon, Sprint, AT&T, and T-Mobile to perform the installation. However, following a series of issues, WMATA decided to wire the tunnels itself.

The bid for connectivity is about more than providing perks for customers amidst decreased ridership numbers. Both Congress and the Federal Transit Administration have pressured Metro to increase its safety measures, and the wiring would improve radio coverage.