refactoring - separate out the listeners
Merge pull request #1 from slodge/master

Separating the two listeners