Implementing more parsing.
Rewrite parser.