Add JINJA templating
Resolve merge conflict