Is a 2 State Solution now possible for the Palestinian territory?

The 2 State solution much touted by the Bush and Clinton Administration did not have that solution to be 2 States. Gaza and the West Bank, but it looks like that is what is developing. When there is no diplomacy on the ground, the parties will create a new dynamic that eventually will draw us in, dragging our feet and whinning the entire time.