NNE: Fix event listeners
NNE: More tests.
NNE: Better broadcast logic