Handling register event
Notifying disconnect events
Fix merge. This shouldn't have happened :|