Create proper container for records instead of just an iterator. Convert progress to an iteratorwrapper, for cleaner code.