Working on master. Only need to detect disconnection now