Back in January, after receiving the recommendations of the panel he formed to examine the National Security Agency’s surveillance programs, President Barack Obama said he wanted to end the NSA’s mass collection of Americans’ phone call records—without crippling its ability to conduct surveillance.

The president gave the Justice Department and the Office of the Director of National Intelligence until March 28 to come up with a plan to make it happen. That date wasn’t just pulled out of the air—it’s also the date that the current Foreign Intelligence Surveillance Court order authorizing the collection program expires. Now, less than a week before the deadline, that plan is in the president’s hands. According to a report from The New York Times, the White House is getting ready to take the wraps off of a legislative package that will both eliminate the NSA’s in-house phone call data store and create a new surveillance court to handle phone data requests. The new court would review requests for phone data directly from the phone companies, allowing records requests that go out two “hops” from a phone number of interest.

The proposed law also would not require phone companies to hold call data for longer than the 18 months currently mandated by existing laws (the NSA currently retains data for five years). But it also would not address any other bulk data collection programs, such as the CIA’s collection of international money transfers, nor would it address the NSA’s overseas surveillance programs.