Moved handlers to constructor -- fixes multiple instances