Functional, but defer to Tian's commit at this stage
Fixed merge conflicts with Tian
Moved the reading of files into the program file, nested the two file requests.