figurin out socket situation
merged changes