CLUNKY_FILE_ABSTRACTION can go now