bunch of changes I can no longer track :p
ignored test.go
wired-in connecting to websocket