Continuing to work on parsing, adding more test cases.