Adding initial pass of templates