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