Does the estimated tax payments for 2018 take the new tax code state, local tax deduction limit of 10,000 as my state and local taxes in 2017 were approximately $18,000