Lazy loading to deal with larger datasets.

[ma595]

Simple fix, but test if we run into this with the restart3 example.