Starting to get closer to a parser, need to get tests passing.