Merging event_handler

Event_handler, event model and some basic tests