Integrating battery storage