Retirement tax questions

Hi Dmertz.

I did not make any IRA distributions or made ROTH conversions in 2016, and I was NOT qualified  to deduct my contributions because my MAGI was above the limit.

You said about filing an amended 2016 Form 8606 with Form 1040X would be best.  Can this be done inside turbo tax too? and can I file it electronically (inside turbo tax) as well?
Can I file this amended 2016 Form 1040X with 8606 return before the april 15 deadline?

Thanks