Week 7 - templates continued