Got the parser working