added templates
merge conflicts, fixed tagged transcript