Initial commit of query_builder