working on templates a bit
working on templates a bit