Major client upgrades, 1st working version