The Two-State Solution is Dead: Now What?