More work on template helper. Looking awful!