Added cond (with test)
Updated TODO