MVP COMMIT. BASE. Still a few minor bugs in sockets that I'm going to try to work out today