More work on the file reader