Finished some socket work