Retirement tax questions

Thanks for the next steps!

 

I hope the change will be reflected next year in TurboTax. Otherwise, I may have to go to a CPA to untangle everything.