First attempt at AND / OR logic.  Still fraught with errors