Started reworking the templates