More like this query

I have not added tests yet, this is just to have a discussion point.