Updates to Architecture, Classes, and a Draft CMS