The immigration-reform bill in the Senate is a solid starting point for solving this problem, and I believe it can be made even better as Congress begins to actively work on it in committee next week.
WSJ: Marco Rubio: The Immigration Reform Opportunity