ignore TODO
refactoring to allow for subsequent loads