#64 Templating (wip)