Initial pass at the remaining components and templates.