Forty-Second Commit

Started to structure the listeners better
Forty-Third Commit

Stuff #42 didn't pick up