More work done on the new parser