better templates, workable storage