Use inheritance in templates to allow more than one file to be wrapped
Removed debug