Updated app to work with websockets