Prepping for boQL v2!