WIP
Update to new template format