ENERGY ARBITRAGE AND PEAK SHAVING IN THE STORAGE MARKET