Yes, it's the best approach. As you can see form this link the IRS form is still in draft, Form 8915-E however the instructions are not and can be viewed at this link: Form 8915-E Instructions.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
