did some stuff w events for new template