Further CMS development
Finished initial CMS implementation