Modifying file reading stuff, still not working properly
merge