WIP Query
Implement query.
Merge branch 'feature/query'