Reimplement supplied queries. Closes #22.