Got event stream working, more refactoring.