OPTIMIZING BATTERY ENERGY STORAGE AND SOLAR