The Partition Plan and the 2 State Solution