Last commit containing CMS

Before all of the specialized code goes in and it gets removed from the
repository.