Completed parser, all tests passing.