Continued work on template capture