Yes, that is correct. I don't think there will be any gaps, because, as Ms. Davis said earlier, the police need the tools to rely on the other provisions that are there in the code. She didn't say that word for word, but she alluded to it in that way.
On April 1st, 2022. See this statement in context.