Adding AND/OR logical operators.  Still needs debugging