FIX: Events are still a total mess. Taking far logner than expected.