Add query_runner instance, and use it to query DB
Merge branch 'cli'