[WIP] refacto/event-processing