Updated tests. Updated README. Refactored into "parser" file.