Forty-Fourth Commit

Finished restructuring the listeners