[#18,#110][s]: start refactoring to use event stream and to new library interface.