Simplified stuff. Adding websockets