Yes, Form 8606 tracks non-deductible IRA Contributions for you.
This form is available currently.
Try the steps outlined in this article on How to Trigger Form 8606.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"