Revert "Issue #2: Re-merge CMI branch."

This reverts commit ce3f73af25f6a329fc094f9c609a6a40612e3b70.