Continued work on file reading code