Gutted the FileParser.parse() method and will start from scratch. Updated the .org file to reflect recent changes.