"then took the remaining money and rolled it"
As Conversion? Or, as Contribution? Because these are different. Have you looked at form 8606?
