using templates
Merge pull request #3 from jeregrine/update

Updating to use views and templates.