replaced event manager

maybe some beautiful typedefs?