Started working on query package.