AND/OR/NOT up and tested
AND/OR/NOT up and tested
merge