Work in progress: refactoring readers to fix issue with reading short files.