Event Manager complete for real