Pass again on the first parts, up to querying. Almost complete, waiting for input of Esteban.