. . . "estate plan including both a will and a trust." . .