Add more TODOs regarding the statements needed for CQL3