Did some work on the template