IMPROVING MARKET DESIGN FOR ENERGY STORAGE