Retirement tax questions

Thank you, I made my 2025 IRA contribution today and I adjusted his 8606.  If he makes a contribution before we file I'll put that $8000 back in and he'll carry the basis over to next year to offset the conversion he'll do right after.