Working on new parser