Revert "Revert "Added templates""

This reverts commit 3bccbd7df0e07ab7c8ae7248e6e1a98d1cee1279.