Starting work on template support