Started reworking templates