Diegos work

@DiegoCortes 's work on templates.