More formatting
Start adding some socket stuff