NOT and OR up and tested, commit before clean