Much improved graphing

Especially for storage