add 'and' and 'or' and bump cyclomatic complexity for engine.js for now
realized if the conditions aren't met an 'if' should return true not false