Week til

Template and a couple of bells and whistles