Retirement tax questions

i have been enlightening myself with IRS instructions ... my understanding is that i need to file (1) 8606 detailing the amount of the recharacterized Roth --> trad, and (2) 1040X with the explanation (& supporting document, 2017 1099-R) - does that sound correct?
thanks for the reply!