Change around some websocket stuff/tomahawk account bits