Yes that would be the exact right process.
Prepare and file your amended return for federal and state together at the end of March.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
