More WIP... template updating works now.