Add diffing, sockets, and other stuff