adding templates and more stuff