Kiran Larry - adding templating