Partially completed rework of server/client logic