First rev of the parser