working on templates a bit