client/server, still needs formatting fixes