Added new templates, added some things to the checklist