add initial work on simple query builder