Removed event listeners as they were not working. Taking a more direct approach
Much more reliable event listener that doesn't depend on a global event, but rather a direct callback within the class.
Also added cleaner debug code