CQL WIP. Refactoring
CQL WIP