Adding jinja
Resolve merge conflicts
Adding lots of stuff