Updated to only use a single listener for events

Fixes #8