Tying energy storage into a modern grid