moved clientproxy crap to main class