Refactoring underway
Merge origin/FileReader
Refactoring underway