Continued work on template in #26.