fixing up client/server interactions and reducing unnecessary classes