Template implementation issues

commiting progress then branching to work through this incrementally

Issue #2