Merged make_socket module into server.  Started refactoring server.  This commit may not run properly.