Modified ClientInfo to include host information; Finished match up scheme