Moved Cql out into its own file