Progress on router and Hogan templating