Second commit to new-branch, changes made to CSVReader and to Setup