Add and test Not and Or
Add an important TODO