My client contributed to a Roth IRA in February of 2022, and then realized that because she would be filing MFJ (she married in 2022) she would be over the Roth income limits.  She then immediately withdrew this contribution (there were no earnings on the contribution).   She had no other IRA accounts.  In February of this year, she contributed this same amount to a non-deductible IRA, and plans on converting this to a Roth under a back-door Roth scenario.  My understanding is that we need to report the non-deductible IRA contribution on her 2022 return, Lines 1,3, 6 and 14 of form 8606.  The conversion will be reported on her 2023 return, after receipt of the associated 1099.  Just want to confirm.