Work in progress

Event Manager added