lots more updates, big start on query builder, still very much in beta