Now with querying by project (still untested)