resolved conflict
completed implementation for ES
refactoring through a real ES system
small refactoring
small refactoring
resolved issue with uncommited_events