parser working after refactor