AdrianC: finished templating