More work on the parser