Verified the query parser works - ported all unittests; the latest changes were big, but now it is by far the best and most elegant we have been...