THERMAL AND ELECTRICAL STORAGE PRIORITIES FOR RESIDENTIAL AND