Added templates and such