Split section 2 and added a first draft of the query language