separated client/server cont'd

separated client/server cont'd