Did more work on the parser and unit tests.