Continued work on templates