Removed references to self, for now!
Figured out how to call functions when using event listeners.