Retirement tax questions

So, if I understand you correctly, I still have to go through the work around, so that I can get to the 1099-R question and enter the JP 2017 code plus the earnings, etc, then correct the 10,000 amt b ack to XXX and I should be golden.