We are waiting to see if IRS and states end up waiving any underpayment penalties or not.
If you wish to wait a little while to file your return to see if, in addition to IRS extending the filing and paying deadline to May 17, which states may also do the same.
You can repost the question again later after the states start responding on whether or not they are extending their filing deadlines.
