Mongo queries mostly complete

Queries are mostly complete, so front-end can start using them