NG-14981 First cut at new start and end events