Fixed bug with lingering eventListeners.  Solution is messy...