Cql lib and schema updates

Work in progress, but making strides toward new schema.