BigRefactoring: New high-level events system working