All tests except the 'or' code now pass
all tests passing except the new or behaviour