Finish adding back server queries.

Closes #17.