Event Management Refactor (Not Working)