AND somewhat implemented, OR remaining