started properties refactor
started properties refactor
refactor
refactored parser