Thanks for this. Just as a follow up, on line 2 of for 8606 then I should only include my non-deductible contributions as my "basis", right?
