Almost finished with "clause" on codegen