Added in a few simple template tags
Updated version