reverted to previous commit since we need a parser with a state for that idea