working on condition parser
merged