Cleaned up a bit and tested wth cmsms 2.0