add templates to all the right places

closes #414