2cond commit
third

almost done