commented out. now remove.
use references to socket ids instead of storing...

the whole damn socket. this will most assuredly help ease memory leaks.
adjust tests a bit