moving to jinja templates