prototype CM. Fixes #274