Retirement tax questions

@BillM223 would you have an ETA for this fix?  Hoping it is this tax year.