Small template work

In Progress