Changing to use Jinja logic
Merge pull request #51 from RichLogan/verification

Changing to use Jinja logic