Start work on sockets wrapper
Refactor sockets