added some new templates and such