Think I made Or short-circuiting, unsure how to test/verify.