Progress on the parser