@orta => Use New Parser

Continuation of #9.