Added AND and OR. There are still some bugs...