Peak-shifting Energy Storage