Working on adding in web sockets