More data, templates, and now images