Cleanup.
Cleanup.
Fix how events are consumed and produced.
Third stab at DPOR.