Worked some more on parsing.