began refactoring events controllers