They always talk about giving amnesty to only those who deserve it and those who are assimilated, so keep your fingers croseed.
Whatever they come up with is going to be debated the week of March 27th. The wait is shorter than it seems.