Yes, indeed. Bill C-22 was in fact where I was going next.
This would establish a committee of parliamentarians. Recently a former director of CSIS said that we should pass it and think about amending it later. I happen to disagree with that. I think we need to really address it and get it right, right now.