Adding templates a little bit at a time