switch from tabs to spaces, removed unnecessary templates, begin integrating CMS