Refactoring, EventLogger stuff, new features, etc.
Refactorring.