major changes for everything - file dir, raw_file issue, functions