Bring in new desktopClient Code