Jinja

- Parses jinja more fully