Object fixed, Event management started

Event management not tested yet.