Improved parses, added functionality for file parsing and hash generation