Long and Short-Cycle Energy Storage