Finish basic version including sockets