Feature/book 723 feedback

Maybe put the variables up the top of the class with the templateName.