More wip - added websockets