Thank you so much. I amended my 2019 Federal return as you described by adding the 1099-R with code P. I appreciate all the help!
