Updating CLS

Closes #11 and also closes #12.