See here. This is what I’ve suggested, and it is urgently needed.
I don’t know if the bill would include the NRA carve-out, which could jeopardize the votes of Sens. Feinstein and Lautenberg.