Working on a websockets version