Estate Planning & Charitable Giving Under the New Tax Law