committing refactored parser
merged