OES2 Optimized Energy Storage