INTEGRATING DISTRIBUTED SOLAR AND STORAGE