First attempt at class rewrite - GenerateEvents is working...