Added zankonpond
Improved disconnect handling
Finished zankonpond
Merge branch 'endterm'