More progress on the parser