A Two State Peace: Defining the Border