add clom, and tests