Made more progress on the CQL schema and presentation.