Event handling improved
Major refactoring and Integration