@orta => Use New Parser

Continuation of #9. 
odd indentation in this file