Leila at Dove's Eye View links to a slideshow (Palestine Israel 101) that has been created by the American Task Force on Palestine, and is an useful introduction for an American audience to the I/P conflict and the two state solution.
One of the slides in the presentation includes this map of the land swaps envisaged by the Geneva Accord.
I found it particularly interesting because to be honest I found the maps attached to the Accord really unfathomable, and it was useful to see things simplified here.
"Land swap" was a principle suggested by the Palestinian side during Camp David II (and further developed at Taba) to minimize the number of Israelis who would be uprooted from illegal Jewish settlements in the Palestinian Territories on the signing of a final peace accord. The vast majority of Jewish settlers live in settlements that abut the Green Line. These settlements would be annexed to Israel, and only the intrusive blocs - e.g. Ariel, Gush Etzion, Kiryat Arba (click thumbnail, left) - would be evacuated. In return, the Palestinians would receive Israeli land equal in size and quality to what had been ceded to Israel, particularly to widen the desperately overcrowded Gaza Strip.
So at the end of the day, 75% of Jewish settlers would be repatriated to Israel without ever leaving their homes, and the new Palestine would be entirely settlement-free. Who says the Palestinians never came up with anything at Camp David?