Completed initial rework of templatetags