Quick pass at templating