Made a little progress on templates