added more templates and functionality