Honestly, I don't know. I am doubtful an agreement will be reached - Democrats (and some reasonable Republicans) want to keep the compromise narrow and GOP wants to completely reform our immigration system. Maybe the proposal Flake was proposing?
I also like Flake’s plan, specially because he has a fallback plan. This ride is definitely going to get a lot interesting within the next few weeks! Personally I think we will be okay, one way or another.