Another pass at client mapping. Currently crashes in sock lookup.