Remove 'should' dependency
Store handlers in array so that they can properly be unsubscribed from - props to @Pleochism