Started adding in display templates