Fleshing out most of the parser, started writing unit tests.