Concerning battery storage CATL plans to start production of Sodium Batteries useful for entry level EV in 2023. CATL predicts the energy density will reach mid level range for 30% of todays price. Other vendors have Chemistry in development with really long life. See Influit Energy for an example.