Added templates and testing