#81 $and + $or implemented, working on tests