I don't see why the endurance listener should not be added. We call `append` twice and it will not replace entries in the array.

Given that we refactor the event handlers in this pull I personally would like to see that we can get the graphics listener adjusted accordingly. Any initial review hasn't had the class variable which holds the listeners now.