I'd say throw the cql recipe into a separate PR so we can just merge it in.