New Query type branch, first commit