New templates

Just a few commits