SIMPLIFYING SOLAR AND STORAGE PROCUREMENT WITH SPURR