Tax law changes

I am looking at adding batteries to the solar panel. Would the batteries be included in the tax credit? Also, since I added the panels this year, would I have to install the batteries this year?