More image work, and initial base templates.