Added untested parser.
Tweaks to the parser.
More parser tweaks.