Initial work on template override