Updated file reading to now use a more generic parsing class that works for any file.