Lawmakers introduced legislation Thursday aimed at resolving the long-running tension between states that legalized medical and recreational marijuana sales and the federal government, which still deems all use a federal crime.

The bill, offered by Sens. Cory Gardner, R-Colo., and Elizabeth Warren, D-Mass., comes after President Trump’s April assurance to Gardner that he would support reform.