Add Config Sections.  Refactor users to single template.