interim work on cmp
refactor/cleanup/docs
refactor/cleanup/docs
refactor/cleanup/docs