Removing some boilerplate, adding teh socket lib