moved these CL queries to their own file.