adding some templating