Domestic Security Enhancement Act (DSEA) (aka Patriot II: the Revenge)
This has been drafted, we'll see what the deal is when they try to pass it...