diff --git a/windows/src/desktop/kmshell/main/Keyman.System.Update.pas b/windows/src/desktop/kmshell/main/Keyman.System.Update.pas
deleted file mode 100644
index fb87834783..0000000000
--- a/windows/src/desktop/kmshell/main/Keyman.System.Update.pas
+++ /dev/null
@@ -1,1302 +0,0 @@
-(*
-  Name:             BackgroundUpdate
-  Copyright:        Copyright (C) SIL International.
-  Documentation:
-  Description:
-  Create Date:      2 Nov 2023
-
-  Modified Date:    2 Nov 2023
-  Authors:          rcruickshank
-  Related Files:
-  Dependencies:
-
-  Bugs:
-  Todo:
-  Notes: For the state diagram in mermaid ../BackgroundUpdateStateDiagram.md
-  History:
-*)
-unit Keyman.System.Update;
-
-interface
-
-uses
-  System.Classes,
-  System.SysUtils,
-  System.UITypes,
-  System.IOUtils,
-  System.Types,
-  Vcl.Forms,
-  TypInfo,
-  KeymanPaths,
-  utilkmshell,
-
-  httpuploader,
-  Keyman.System.UpdateCheckResponse,
-  Keyman.System.ExecuteHistory,
-  UfrmDownloadProgress;
-
-type
-  EBackgroundUpdate = class(Exception);
-
-  TBackgroundUpdateResult = (oucUnknown, oucShutDown, oucSuccess, oucNoUpdates, oucUpdatesAvailable, oucFailure, oucOffline);
-
-  TUpdateState = (usIdle, usUpdateAvailable, usDownloading, usWaitingRestart, usInstalling, usRetry, usWaitingPostInstall);
-
-  { Keyboard Package Params }
-  TBackgroundUpdateParamsPackage = record
-    ID: string;
-    NewID: string;
-    Description: string;
-    OldVersion, NewVersion: string;
-    DownloadURL: string;
-    SavePath: string;
-    FileName: string;
-    DownloadSize: Integer;
-    Install: Boolean;
-  end;
-  { Main Keyman Program }
-  TBackgroundUpdateParamsKeyman = record
-    OldVersion, NewVersion: string;
-    DownloadURL: string;
-    SavePath: string;
-    FileName: string;
-    DownloadSize: Integer;
-    Install: Boolean;
-  end;
-
-  TBackgroundUpdateParams = record
-    Keyman: TBackgroundUpdateParamsKeyman;
-    Packages: array of TBackgroundUpdateParamsPackage;
-    Result: TBackgroundUpdateResult;
-  end;
-
-  TBackgroundUpdateDownloadParams = record
-    Owner: TfrmDownloadProgress;
-    TotalSize: Integer;
-    TotalDownloads: Integer;
-    StartPosition: Integer;
-  end;
-
-   // Forward declaration
-   TBackgroundUpdate = class;
-    { State Classes Update }
-
-   TStateClass = class of TState;
-
-  TState = class abstract
-  private
-    bucStateContext: TBackgroundUpdate;
-    procedure ChangeState(newState: TStateClass);
-
-  public
-    constructor Create(Context: TBackgroundUpdate);
-    procedure Enter; virtual; abstract;
-    procedure Exit; virtual; abstract;
-    procedure HandleCheck; virtual; abstract;
-    procedure HandleDownload; virtual; abstract;
-    function  HandleKmShell : Integer; virtual; abstract;
-    procedure HandleInstall; virtual; abstract;
-    procedure HandleMSIInstallComplete; virtual; abstract;
-    procedure HandleAbort; virtual; abstract;
-    procedure HandleInstallNow; virtual; abstract;
-
-    // For convenience
-    function StateName: string; virtual; abstract;
-
-  end;
-
-  // Derived classes for each state
-  IdleState = class(TState)
-  public
-    procedure Enter; override;
-    procedure Exit; override;
-    procedure HandleCheck; override;
-    procedure HandleDownload; override;
-    function  HandleKmShell : Integer; override;
-    procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
-    procedure HandleAbort; override;
-    procedure HandleInstallNow; override;
-    function StateName: string; override;
-  end;
-
-  UpdateAvailableState = class(TState)
-  public
-    procedure Enter; override;
-    procedure Exit; override;
-    procedure HandleCheck; override;
-    procedure HandleDownload; override;
-    function  HandleKmShell : Integer; override;
-    procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
-    procedure HandleAbort; override;
-    procedure HandleInstallNow; override;
-    function StateName: string; override;
-  end;
-
-  DownloadingState = class(TState)
-  private
-
-    function DownloadUpdatesBackground: Boolean;
-    procedure Enter; override;
-    procedure Exit; override;
-    procedure HandleCheck; override;
-    procedure HandleDownload; override;
-    function  HandleKmShell : Integer; override;
-    procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
-    procedure HandleAbort; override;
-    procedure HandleInstallNow; override;
-    function StateName: string; override;
-  end;
-
-  WaitingRestartState = class(TState)
-  public
-    procedure Enter; override;
-    procedure Exit; override;
-    procedure HandleCheck; override;
-    procedure HandleDownload; override;
-    function  HandleKmShell : Integer; override;
-    procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
-    procedure HandleAbort; override;
-    procedure HandleInstallNow; override;
-    function StateName: string; override;
-  end;
-
-  InstallingState = class(TState)
-  private
-    procedure DoInstallKeyman; overload;
-    function DoInstallKeyman(SavePath: string) : Boolean; overload;
-    {
-      Installs the Keyman file using either msiexec.exe or the setup launched in
-      a separate shell.
-
-      @params  Package  The package to be installed.
-
-      @returns True  if the installation is successful, False otherwise.
-    }
-    function DoInstallPackage(Package: TBackgroundUpdateParamsPackage): Boolean;
-  public
-    procedure Enter; override;
-    procedure Exit; override;
-    procedure HandleCheck; override;
-    procedure HandleDownload; override;
-    function  HandleKmShell : Integer; override;
-    procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
-    procedure HandleAbort; override;
-    procedure HandleInstallNow; override;
-    function StateName: string; override;
-  end;
-
-  RetryState = class(TState)
-  public
-    procedure Enter; override;
-    procedure Exit; override;
-    procedure HandleCheck; override;
-    procedure HandleDownload; override;
-    function  HandleKmShell : Integer; override;
-    procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
-    procedure HandleAbort; override;
-    procedure HandleInstallNow; override;
-    function StateName: string; override;
-  end;
-
-  WaitingPostInstallState = class(TState)
-  public
-    procedure Enter; override;
-    procedure Exit; override;
-    procedure HandleCheck; override;
-    procedure HandleDownload; override;
-    function  HandleKmShell : Integer; override;
-    procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
-    procedure HandleAbort; override;
-    procedure HandleInstallNow; override;
-    function StateName: string; override;
-  end;
-
-  { This class also controls the state flow see  }
-  TBackgroundUpdate = class
-  private
-    FForce: Boolean;
-    FAuto: Boolean;
-    FParams: TBackgroundUpdateParams;
-
-    FErrorMessage: string;
-
-    DownloadTempPath: string;
-
-    FShowErrors: Boolean;
-
-
-
-    FDownload: TBackgroundUpdateDownloadParams;
-
-    CurrentState: TState;
-    // State object for performance (could lazy create?)
-    FIdle: IdleState;
-    FUpdateAvailable: UpdateAvailableState;
-    FDownloading: DownloadingState;
-    FWaitingRestart: WaitingRestartState;
-    FInstalling: InstallingState;
-    FRetry: RetryState;
-    FWaitingPostInstall: WaitingPostInstallState;
-    function GetState: TStateClass;
-    procedure SetState(const Value: TStateClass);
-    procedure SetStateOnly(const Value: TStateClass);
-    function ConvertEnumState(const TEnumState: TUpdateState): TStateClass;
-
-    procedure ShutDown;
-
-    {
-      SavePackageUpgradesToDownloadTempPath saves any new package IDs to a
-      single file in the download tempPath. This procedure saves the IDs of any
-      new packages to a file named "upgrade_packages.inf" in the download
-      tempPath.
-    }
-    procedure SavePackageUpgradesToDownloadTempPath;
-    function checkUpdateSchedule : Boolean;
-
-    function SetRegistryState (Update : TUpdateState): Boolean;
-    function SetRegistryInstallMode (InstallMode : Boolean): Boolean;
-
-  protected
-  property State: TStateClass read GetState write SetState;
-
-  public
-    constructor Create(AForce: Boolean);
-    destructor Destroy; override;
-
-    procedure   HandleCheck;
-    function    HandleKmShell : Integer;
-    procedure   HandleDownload;
-    procedure   HandleInstall;
-    procedure   HandleMSIInstallComplete;
-    procedure   HandleAbort;
-    procedure   HandleInstallNow;
-    function    CurrentStateName: string;
-
-    property ShowErrors: Boolean read FShowErrors write FShowErrors;
-    function CheckRegistryState : TUpdateState;
-    function CheckRegistryInstallMode : Boolean;
-
-  end;
-
-  IOnlineUpdateSharedData = interface
-    ['{7442A323-C1E3-404B-BEEA-5B24A52BBB0E}']
-    function Params: TBackgroundUpdateParams;
-  end;
-
-  TOnlineUpdateSharedData = class(TInterfacedObject, IOnlineUpdateSharedData)
-  private
-    FParams: TBackgroundUpdateParams;
-  public
-    constructor Create(AParams: TBackgroundUpdateParams);
-    function Params: TBackgroundUpdateParams;
-  end;
-
-implementation
-
-uses
-  Winapi.Shlobj,
-  System.WideStrUtils,
-  Vcl.Dialogs,
-  Winapi.ShellApi,
-  Winapi.Windows,
-  Winapi.WinINet,
-
-  GlobalProxySettings,
-  KLog,
-  keymanapi_TLB,
-  KeymanVersion,
-  kmint,
-  ErrorControlledRegistry,
-  RegistryKeys,
-  Upload_Settings,
-  utildir,
-  utilexecute,
-  OnlineUpdateCheckMessages,    // todo create own messages
-  UfrmOnlineUpdateIcon,
-  UfrmOnlineUpdateNewVersion,
-  utilsystem,
-  utiluac,
-  versioninfo,
-  Keyman.System.RemoteUpdateCheck,
-  Keyman.System.DownloadUpdate;
-
-const
-  SPackageUpgradeFilename = 'upgrade_packages.inf';
-  kmShellContinue = 0;
-  kmShellExit = 1;
-
-{ TBackgroundUpdate }
-
-constructor TBackgroundUpdate.Create(AForce : Boolean);
-var TSerailsedState : TUpdateState;
-begin
-  inherited Create;
-
-
-  FShowErrors := True;
-  FParams.Result := oucUnknown;
-
-  FForce := AForce;
-  FAuto := True; // Default to automatically check, download, and install
-  FIdle := IdleState.Create(Self);
-  FUpdateAvailable := UpdateAvailableState.Create(Self);
-  FDownloading := DownloadingState.Create(Self);
-  FWaitingRestart := WaitingRestartState.Create(Self);
-  FInstalling := InstallingState.Create(Self);
-  FRetry := RetryState.Create(Self);
-  FWaitingPostInstall := WaitingPostInstallState.Create(Self);
-  // Check the Registry setting.
-  SetStateOnly(ConvertEnumState(CheckRegistryState));
-  KL.Log('TBackgroundUpdate.Create');
-end;
-
-destructor TBackgroundUpdate.Destroy;
-begin
-  if (FErrorMessage <> '') and FShowErrors then
-    KL.Log(FErrorMessage);
-
-  if FParams.Result = oucShutDown then
-    ShutDown;
-
-  FIdle.Free;
-  FUpdateAvailable.Free;
-  FDownloading.Free;
-  FWaitingRestart.Free;
-  FInstalling.Free;
-  FRetry.Free;
-  FWaitingPostInstall.Free;
-
-  KL.Log('TBackgroundUpdate.Destroy: FErrorMessage = '+FErrorMessage);
-  KL.Log('TBackgroundUpdate.Destroy: FParams.Result = '+IntToStr(Ord(FParams.Result)));
-
-  inherited Destroy;
-end;
-
-
-procedure TBackgroundUpdate.SavePackageUpgradesToDownloadTempPath;
-var
-  i: Integer;
-begin
-  with TStringList.Create do
-  try
-    for i := 0 to High(FParams.Packages) do
-      if FParams.Packages[i].NewID <> '' then
-        Add(FParams.Packages[i].NewID+'='+FParams.Packages[i].ID);
-    if Count > 0 then
-      SaveToFile(DownloadTempPath + SPackageUpgradeFileName);
-  finally
-    Free;
-  end;
-end;
-
-procedure TBackgroundUpdate.ShutDown;
-begin
-  if Assigned(Application) then
-    Application.Terminate;
-end;
-
-
-{ TOnlineUpdateSharedData }
-
-constructor TOnlineUpdateSharedData.Create(AParams: TBackgroundUpdateParams);
-begin
-  inherited Create;
-  FParams := AParams;
-end;
-
-function TOnlineUpdateSharedData.Params: TBackgroundUpdateParams;
-begin
-  Result := FParams;
-end;
-
-
-function TBackgroundUpdate.SetRegistryState(Update : TUpdateState): Boolean;
-var
-  UpdateStr : string;
-begin
-
-  Result := False;
-  with TRegistryErrorControlled.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    KL.Log('SetRegistryState State Entry');
-    if OpenKey(SRegKey_KeymanEngine_LM, True) then
-    begin
-        UpdateStr := GetEnumName(TypeInfo(TUpdateState), Ord(Update));
-        WriteString(SRegValue_Update_State, UpdateStr);
-        KL.Log('SetRegistryState State is:[' + UpdateStr + ']');
-    end;
-    Result := True;
-  finally
-      Free;
-  end;
-
-end;
-
-
-function TBackgroundUpdate.CheckRegistryState : TUpdateState;  // I2329
-var
-  UpdateState : TUpdateState;
-
-begin
-  // We will use a registry flag to maintain the state of the background update
-
-  UpdateState := usIdle; // do we need a unknown state ?
-  // check the registry value
-  with TRegistryErrorControlled.Create do  // I2890
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    if OpenKeyReadOnly(SRegKey_KeymanEngine_LM) and ValueExists(SRegValue_Update_State) then
-      begin
-        UpdateState := TUpdateState(GetEnumValue(TypeInfo(TUpdateState), ReadString(SRegValue_Update_State)));
-        KL.Log('CheckRegistryState State is:[' + ReadString(SRegValue_Update_State) + ']');
-      end
-    else
-      begin
-          UpdateState := usIdle; // do we need a unknown state ?
-          KL.Log('CheckRegistryState State reg value not found default:[' + ReadString(SRegValue_Update_State) + ']');
-      end
-    finally
-      Free;
-  end;
-  Result := UpdateState;
-end;
-
-function TBackgroundUpdate.SetRegistryInstallMode (InstallMode : Boolean): Boolean;
-var
-  InstallModeStr : string;
-begin
-
-  Result := False;
-  with TRegistryErrorControlled.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    KL.Log('SetRegistryState State Entry');
-    if OpenKey(SRegKey_KeymanEngine_LM, True) then
-    begin
-        InstallModeStr := BoolToStr(InstallMode, True);
-        WriteString(SRegValue_Install_Mode, InstallModeStr);
-        KL.Log('SetRegistryInstallMode is:[' + InstallModeStr + ']');
-    end;
-    Result := True;
-  finally
-      Free;
-  end;
-
-end;
-
-function TBackgroundUpdate.CheckRegistryInstallMode : Boolean;
-var
-  InstallMode : Boolean;
-
-begin
-  // We will use a registry flag to maintain the install mode background/foreground
-
-  InstallMode := False;
-  // check the registry value
-  with TRegistryErrorControlled.Create do  // I2890
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    if OpenKeyReadOnly(SRegKey_KeymanEngine_LM) and ValueExists(SRegValue_Install_Mode) then
-      begin
-        InstallMode := StrToBool(ReadString(SRegValue_Install_Mode));
-        KL.Log('CheckRegistryState State is:[' + ReadString(SRegValue_Update_State) + ']');
-      end
-    else
-      begin
-          InstallMode := False; // default to background
-          KL.Log('CheckRegistryInstallMode reg value not found default:[ False ]');
-      end
-    finally
-      Free;
-  end;
-  Result := InstallMode;
-end;
-
-
-function TBackgroundUpdate.CheckUpdateSchedule: Boolean;
-begin
-  try
-    Result := False;
-    with TRegistryErrorControlled.Create do
-    try
-      if OpenKeyReadOnly(SRegKey_KeymanDesktop_CU) then
-      begin
-        if ValueExists(SRegValue_CheckForUpdates) and not ReadBool(SRegValue_CheckForUpdates) and not FForce then
-        begin
-          Result := False;
-          Exit;
-        end;
-        if ValueExists(SRegValue_LastUpdateCheckTime) and (Now - ReadDateTime(SRegValue_LastUpdateCheckTime) < 1) and not FForce then
-        begin
-          Result := False;
-          Exit;
-        end;
-        // Else Time to check for updates
-        Result := True;
-      end;
-    finally
-      Free;
-    end;
-  except
-    { we will not run the check if an error occurs reading the settings }
-    on E:Exception do
-    begin
-      Result := False;
-      FErrorMessage := E.Message;
-      Exit;
-    end;
-  end;
-end;
-
-function TBackgroundUpdate.GetState: TStateClass;
-begin
-  Result := TStateClass(CurrentState.ClassType);
-end;
-
-procedure TBackgroundUpdate.SetState(const Value: TStateClass);
-begin
-  if Assigned(CurrentState) then
-  begin
-    CurrentState.Exit;
-  end;
-
-  SetStateOnly(Value);
-
-  if Assigned(CurrentState) then
-  begin
-    CurrentState.Enter;
-  end
-  else
-  begin
-   // TODO: #10210 Error log for Unable to set state for Value
-  end;
-
-end;
-
-procedure TBackgroundUpdate.SetStateOnly(const Value: TStateClass);
-begin
-  if Value = IdleState then
-  begin
-    CurrentState := FIdle;
-  end
-  else if Value = UpdateAvailableState then
-  begin
-    CurrentState := FUpdateAvailable;
-  end
-  else if Value = DownloadingState then
-  begin
-    CurrentState := FDownloading;
-  end
-  else if Value = WaitingRestartState then
-  begin
-    CurrentState := FWaitingRestart;
-  end
-  else if Value = InstallingState then
-  begin
-    CurrentState := FInstalling;
-  end
-  else if Value = RetryState then
-  begin
-    CurrentState := FRetry;
-  end
-  else if Value = WaitingPostInstallState then
-  begin
-    CurrentState := FWaitingPostInstall;
-  end;
-end;
-
-function TBackgroundUpdate.ConvertEnumState(const TEnumState: TUpdateState) : TStateClass;
-begin
-  case  TEnumState of
-    usIdle: Result := IdleState;
-    usUpdateAvailable: Result := UpdateAvailableState;
-    usDownloading: Result := DownloadingState;
-    usWaitingRestart: Result := WaitingRestartState;
-    usInstalling: Result := InstallingState;
-    usRetry: Result := RetryState;
-    usWaitingPostInstall: Result := WaitingPostInstallState;
-  else
-    // TODO: #10210 Log error unknown state setting to idle
-    Result := IdleState;
-  end;
-end;
-
-procedure TBackgroundUpdate.HandleCheck;
-begin
-  CurrentState.HandleCheck;
-end;
-
-function TBackgroundUpdate.HandleKmShell;
-begin
-  Result := CurrentState.HandleKmShell;
-end;
-
-procedure TBackgroundUpdate.HandleDownload;
-begin
-  CurrentState.HandleDownload;
-end;
-
-procedure TBackgroundUpdate.HandleInstall;
-begin
-  CurrentState.HandleInstall;
-end;
-
-procedure TBackgroundUpdate.HandleMSIInstallComplete;
-begin
-  CurrentState.HandleMSIInstallComplete;
-end;
-
-procedure TBackgroundUpdate.HandleAbort;
-begin
-  CurrentState.HandleAbort;
-end;
-
-procedure TBackgroundUpdate.HandleInstallNow;
-begin
-  CurrentState.HandleInstallNow;
-end;
-
-function TBackgroundUpdate.CurrentStateName: string;
-begin
-  Result := CurrentState.StateName;
-end;
-
-
-
-{ State Class Memebers }
-constructor TState.Create(Context: TBackgroundUpdate);
-begin
-  bucStateContext := Context;
-end;
-
-procedure TState.ChangeState(NewState: TStateClass);
-begin
-  bucStateContext.State := NewState;
-end;
-
-
-{ IdleState }
-
-procedure IdleState.Enter;
-begin
-  // Enter UpdateAvailableState
-  bucStateContext.SetRegistryState(usIdle);
-end;
-
-procedure IdleState.Exit;
-begin
-
-end;
-
-procedure IdleState.HandleCheck;
-var
-  CheckForUpdates: TRemoteUpdateCheck;
-  Result : TRemoteUpdateCheckResult;
-begin
-
-  { Make a HTTP request out and see if updates are available for now do
-    this all in the Idle HandleCheck message. But could be broken into an
-    seperate state of WaitngCheck RESP }
-  { if Response not OK stay in the idle state and return }
-
-
-  // should be false but forcing check for testing
-  //CheckForUpdates := TRemoteUpdateCheck.Create(True);
-  CheckForUpdates := TRemoteUpdateCheck.Create(False);
-  try
-     Result:= CheckForUpdates.Run;
-  finally
-    CheckForUpdates.Free;
-  end;
-
-  { Response OK and Update is available }
-  if Result = wucSuccess then
-  begin
-    ChangeState(UpdateAvailableState);
-  end;
-  // else staty in idle state
-end;
-
-procedure IdleState.HandleDownload;
-begin
-
-end;
-
-function IdleState.HandleKmShell;
-begin
-
-  Result := kmShellContinue;
-end;
-
-procedure IdleState.HandleInstall;
-begin
-
-end;
-
-procedure IdleState.HandleMSIInstallComplete;
-begin
-
-end;
-
-procedure IdleState.HandleAbort;
-begin
-
-end;
-
-procedure IdleState.HandleInstallNow;
-begin
-  bucStateContext.SetRegistryInstallMode(True);
-  bucStateContext.CurrentState.HandleCheck;
-end;
-
-function IdleState.StateName;
-begin
-
-  Result := 'IdleState';
-end;
-
-{ UpdateAvailableState }
-
-procedure UpdateAvailableState.Enter;
-begin
-  // Enter UpdateAvailableState
-  bucStateContext.SetRegistryState(usUpdateAvailable);
-  if bucStateContext.FAuto then
-  begin
-    bucStateContext.CurrentState.HandleDownload;
-  end;
-end;
-
-procedure UpdateAvailableState.Exit;
-begin
-  // Exit UpdateAvailableState
-end;
-
-procedure UpdateAvailableState.HandleCheck;
-begin
-
-end;
-
-procedure UpdateAvailableState.HandleDownload;
-begin
-  ChangeState(DownloadingState);
-end;
-
-function UpdateAvailableState.HandleKmShell;
-begin
-  if bucStateContext.FAuto then
-  begin
-    bucStateContext.CurrentState.HandleDownload ;
-  end;
-  Result := kmShellContinue;
-end;
-
-procedure UpdateAvailableState.HandleInstall;
-begin
-
-end;
-
-procedure UpdateAvailableState.HandleMSIInstallComplete;
-begin
-
-end;
-
-procedure UpdateAvailableState.HandleAbort;
-begin
-
-end;
-
-procedure UpdateAvailableState.HandleInstallNow;
-begin
-  bucStateContext.SetRegistryInstallMode(True);
-  ChangeState(DownloadingState);
-end;
-
-function UpdateAvailableState.StateName;
-begin
-
-  Result := 'UpdateAvailableState';
-end;
-
-{ DownloadingState }
-
-procedure DownloadingState.Enter;
-var DownloadResult : Boolean;
-begin
-  // Enter DownloadingState
-  bucStateContext.SetRegistryState(usDownloading);
-  DownloadResult := DownloadUpdatesBackground;
-  if DownloadResult then
-  begin
-    if HasKeymanRun then
-      ChangeState(WaitingRestartState)
-    else
-      ChangeState(InstallingState);
-  end
-  else
-  begin
-    ChangeState(RetryState);
-  end
-end;
-
-procedure DownloadingState.Exit;
-begin
-  // Exit DownloadingState
-end;
-
-procedure DownloadingState.HandleCheck;
-begin
-
-end;
-
-procedure DownloadingState.HandleDownload;
-var DownloadResult : Boolean;
-begin
-  // We are already downloading do nothing
-end;
-
-function DownloadingState.HandleKmShell;
-var DownloadResult : Boolean;
-begin
-  DownloadResult := DownloadUpdatesBackground;
-  // TODO check if keyman is running then send to Waiting Restart
-  if DownloadResult then
-  begin
-    if HasKeymanRun then
-    begin
-      ChangeState(WaitingRestartState);
-      Result := kmShellContinue;
-    end
-    else
-    begin
-      ChangeState(InstallingState);
-      Result := kmShellExit;
-    end;
-  end
-  else
-  begin
-    ChangeState(RetryState);
-    Result := kmShellContinue;
-  end;
-
-end;
-
-procedure DownloadingState.HandleInstall;
-begin
-  ChangeState(InstallingState);
-end;
-
-procedure DownloadingState.HandleMSIInstallComplete;
-begin
-
-end;
-
-procedure DownloadingState.HandleAbort;
-begin
-end;
-
-procedure DownloadingState.HandleInstallNow;
-begin
-  bucStateContext.SetRegistryInstallMode(True);
-  // Continue downloading
-end;
-
-function DownloadingState.StateName;
-begin
-  Result := 'DownloadingState';
-end;
-
-
-function DownloadingState.DownloadUpdatesBackground: Boolean;
-var
-  i: Integer;
-  DownloadBackGroundSavePath : String;
-  DownloadResult : Boolean;
-  DownloadUpdate: TDownloadUpdate;
-begin
-  DownloadUpdate := TDownloadUpdate.Create;
-  try
-    DownloadResult := DownloadUpdate.DownloadUpdates;
-    KL.Log('TBackgroundUpdate.DownloadUpdatesBackground: DownloadResult = '+IntToStr(Ord(DownloadResult)));
-    Result := DownloadResult;
-// #TODO: #10210 workout when we need to refresh kmcom keyboards
-
-//      if Result in [ wucSuccess] then
-//  begin
-//    kmcom.Keyboards.Refresh;
-//    kmcom.Keyboards.Apply;
-//    kmcom.Packages.Refresh;
-//  end;
-
-  finally
-    DownloadUpdate.Free;
-  end;
-end;
-
-{ WaitingRestartState }
-
-procedure WaitingRestartState.Enter;
-begin
-  // Enter DownloadingState
-  bucStateContext.SetRegistryState(usWaitingRestart);
-end;
-
-procedure WaitingRestartState.Exit;
-begin
-  // Exit DownloadingState
-end;
-
-procedure WaitingRestartState.HandleCheck;
-begin
-
-end;
-
-procedure WaitingRestartState.HandleDownload;
-begin
-
-end;
-
-function WaitingRestartState.HandleKmShell;
-var
-  SavedPath : String;
-  Filenames : TStringDynArray;
-begin
-  KL.Log('WaitingRestartState.HandleKmShell Enter');
-  // Still can't go if keyman has run
-  if HasKeymanRun then
-  begin
-    KL.Log('WaitingRestartState.HandleKmShell Keyman Has Run');
-    Result := kmShellExit;
-    // Exit; // Exit is not wokring for some reason.
-    // this else is only here because the exit is not working.
-  end
-  else
-  begin
-    // Check downloaded cache if available then
-    SavedPath := IncludeTrailingPathDelimiter(TKeymanPaths.KeymanUpdateCachePath);
-    GetFileNamesInDirectory(SavedPath, FileNames);
-    if Length(FileNames) = 0 then
-    begin
-        KL.Log('WaitingRestartState.HandleKmShell No Files in Download Cache');
-        // Return to Idle state and check for Updates state
-        ChangeState(IdleState);
-        bucStateContext.CurrentState.HandleCheck;
-        Result := kmShellExit;
-        // Exit; // again exit was not working
-    end
-    else
-    begin
-      KL.Log('WaitingRestartState.HandleKmShell is good to install');
-      ChangeState(InstallingState);
-      Result := kmShellExit;
-    end;
-  end;
-end;
-
-procedure WaitingRestartState.HandleInstall;
-begin
-
-end;
-
-procedure WaitingRestartState.HandleMSIInstallComplete;
-begin
-
-end;
-
-procedure WaitingRestartState.HandleAbort;
-begin
-
-end;
-
-procedure WaitingRestartState.HandleInstallNow;
-begin
-  bucStateContext.SetRegistryInstallMode(True);
-  // Notify User to install
-  ChangeState(InstallingState);
-
-end;
-
-function WaitingRestartState.StateName;
-begin
-
-  Result := 'WaitingRestartState';
-end;
-
-{ InstallingState }
-
-function InstallingState.DoInstallPackage(Package: TBackgroundUpdateParamsPackage): Boolean;
-var
-  FPackage: IKeymanPackageFile2;
-begin
-  Result := True;
-
-  FPackage := kmcom.Packages.GetPackageFromFile(Package.SavePath) as IKeymanPackageFile2;
-  FPackage.Install2(True);  // Force overwrites existing package and leaves most settings for it intact
-  FPackage := nil;
-
-  kmcom.Refresh;
-  kmcom.Apply;
-  System.SysUtils.DeleteFile(Package.SavePath);
-end;
-
-procedure InstallingState.DoInstallKeyman;
-var
-  s: string;
-  FResult: Boolean;
-begin
-  FResult := False;
-  s := LowerCase(ExtractFileExt(bucStateContext.FParams.Keyman.SavePath));
-  if s = '.msi' then
-    FResult := TUtilExecute.Shell(0, 'msiexec.exe', '', '/qb /i "'+bucStateContext.FParams.Keyman.SavePath+'" AUTOLAUNCHPRODUCT=1')  // I3349
-  else if s = '.exe' then
-    FResult := TUtilExecute.Shell(0, bucStateContext.FParams.Keyman.SavePath, '', '-au')  // I3349
-  else
-    Exit;
-  if not FResult then
-    ShowMessage(SysErrorMessage(GetLastError));
-end;
-
-function InstallingState.DoInstallKeyman(SavePath: string) : Boolean;
-var
-  s: string;
-  FResult: Boolean;
-begin
-  s := LowerCase(ExtractFileExt(SavePath));
-  if s = '.msi' then
-    FResult := TUtilExecute.Shell(0, 'msiexec.exe', '', '/qb /i "'+SavePath+'" AUTOLAUNCHPRODUCT=1')  // I3349
-  else if s = '.exe' then
-  begin
-    KL.Log('TBackgroundUpdate.InstallingState.DoInstallKeyman SavePath:"'+ SavePath+'"');
-    FResult := TUtilExecute.Shell(0, SavePath, '', '-au')  // I3349
-  end
-  else
-    FResult := False;
-
-  if not FResult then
-  begin
-     KL.Log('TBackgroundUpdate.InstallingState.DoInstall: Result = '+IntToStr(Ord(FResult)));
-     // Log messageShowMessage(SysErrorMessage(GetLastError));
-  end;
-
-  Result := FResult;
-end;
-
-procedure InstallingState.Enter;
-var
-  SavePath: String;
-  fileExt : String;
-  fileName: String;
-  fileNames: TStringDynArray;
-begin
-    bucStateContext.SetRegistryState(usInstalling);
-    SavePath := IncludeTrailingPathDelimiter(TKeymanPaths.KeymanUpdateCachePath);
-
-    GetFileNamesInDirectory(SavePath, fileNames);
-    // for now we only want the exe although excute install can
-    // handle msi
-    for fileName in fileNames do
-    begin
-      fileExt := LowerCase(ExtractFileExt(fileName));
-      if fileExt = '.exe' then
-        break;
-    end;
-
-    if DoInstallKeyman(SavePath + ExtractFileName(fileName)) then
-    begin
-       KL.Log('TBackgroundUpdate.InstallingState.Enter: DoInstall OK');
-    end
-    else
-    begin
-        // TODO: #10210 clean failed download
-        // TODO: #10210 Do we do a retry on install? probably not
-        KL.Log('TBackgroundUpdate.InstallingState.Enter: DoInstall fail');
-        ChangeState(IdleState);
-    end
-end;
-
-procedure InstallingState.Exit;
-begin
-  // Exit DownloadingState
-end;
-
-procedure InstallingState.HandleCheck;
-begin
-
-end;
-
-procedure InstallingState.HandleDownload;
-begin
-
-end;
-
-function InstallingState.HandleKmShell;
-begin
-  // Result = exit straight away as we are installing (MSI installer)
-  // need to just do a no-op keyman will it maybe using kmshell to install
-  // packages.
-  Result := kmShellContinue;
-end;
-
-procedure InstallingState.HandleInstall;
-begin
-
-end;
-
-procedure InstallingState.HandleMSIInstallComplete;
-begin
-
-end;
-
-procedure InstallingState.HandleAbort;
-begin
-  ChangeState(IdleState);
-end;
-
-procedure InstallingState.HandleInstallNow;
-begin
-  // Do Nothing. Need the UI to let user know installation in progress OR
-end;
-
-function InstallingState.StateName;
-begin
-
-  Result := 'InstallingState';
-end;
-
-{ RetryState }
-
-procedure RetryState.Enter;
-begin
-  // Enter DownloadingState
-  bucStateContext.SetRegistryState(usRetry);
-end;
-
-procedure RetryState.Exit;
-begin
-  // Exit DownloadingState
-end;
-
-procedure RetryState.HandleCheck;
-begin
-
-end;
-
-procedure RetryState.HandleDownload;
-begin
-
-end;
-
-function RetryState.HandleKmShell;
-begin
-  // #TODO: #10210 Implement retry
-  Result := kmShellContinue
-end;
-
-procedure RetryState.HandleInstall;
-begin
-
-end;
-
-procedure RetryState.HandleMSIInstallComplete;
-begin
-
-end;
-
-procedure RetryState.HandleAbort;
-begin
-
-end;
-
-procedure RetryState.HandleInstallNow;
-begin
-  bucStateContext.SetRegistryInstallMode(True);
-  // TODO: #10038 handle retry counts
-  ChangeState(InstallingState);
-end;
-
-function RetryState.StateName;
-begin
-
-  Result := 'RetryState';
-end;
-
-{ WaitingPostInstallState }
-
-procedure WaitingPostInstallState.Enter;
-begin
-  // Enter downloading state
-  bucStateContext.SetRegistryState(usWaitingPostInstall);
-end;
-
-procedure WaitingPostInstallState.Exit;
-begin
-  // Exit downloading state
-end;
-
-procedure WaitingPostInstallState.HandleCheck;
-begin
-  // Handle Check
-end;
-
-procedure WaitingPostInstallState.HandleDownload;
-begin
-  // Handle Download
-end;
-
-function WaitingPostInstallState.HandleKmShell;
-begin
-  // TODO: #10210  have a counter if we get called in this state
-  // too many time abort.
-  HandleMSIInstallComplete;
-  Result := kmShellContinue;
-end;
-
-procedure WaitingPostInstallState.HandleInstall;
-begin
-  // Handle Install
-end;
-
-procedure WaitingPostInstallState.HandleMSIInstallComplete;
-var SavePath: string;
-    FileName: String;
-    FileNames: TStringDynArray;
-begin
-      KL.Log('WaitingPostInstallState.HandleMSIInstallComplete');
-      SavePath := IncludeTrailingPathDelimiter(TKeymanPaths.KeymanUpdateCachePath);
-      KL.Log('WaitingPostInstallState.HandleMSIInstallComplete remove SavePath:'+ SavePath);
-
-      GetFileNamesInDirectory(SavePath, FileNames);
-      for FileName in FileNames do
-      begin
-        System.SysUtils.DeleteFile(FileName);
-      end;
-      ChangeState(IdleState);
-end;
-
-procedure WaitingPostInstallState.HandleAbort;
-begin
-  // Handle Abort
-end;
-
-procedure WaitingPostInstallState.HandleInstallNow;
-begin
-  // Do nothing as files will be cleaned via HandleKmShell
-end;
-
-function WaitingPostInstallState.StateName;
-begin
-
-  Result := 'WaitingPostInstallState';
-end;
-
-
-
-end.
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
index 6d6eb9b426..589bca7582 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
@@ -35,6 +35,9 @@ uses
   Keyman.System.ExecuteHistory,
   UfrmDownloadProgress;
 
+const
+  CheckPeriod: Integer = 7; // Days between checking for updates
+
 type
   EUpdateStateMachine = class(Exception);
 
@@ -93,10 +96,8 @@ type
     procedure Enter; virtual; abstract;
     procedure Exit; virtual; abstract;
     procedure HandleCheck; virtual; abstract;
-    procedure HandleDownload; virtual; abstract;
     function  HandleKmShell : Integer; virtual; abstract;
     procedure HandleInstall; virtual; abstract;
-    procedure HandleMSIInstallComplete; virtual; abstract;
     procedure HandleAbort; virtual; abstract;
     procedure HandleInstallNow; virtual; abstract;
 
@@ -111,10 +112,8 @@ type
     procedure Enter; override;
     procedure Exit; override;
     procedure HandleCheck; override;
-    procedure HandleDownload; override;
     function  HandleKmShell : Integer; override;
     procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
     function StateName: string; override;
@@ -125,10 +124,8 @@ type
     procedure Enter; override;
     procedure Exit; override;
     procedure HandleCheck; override;
-    procedure HandleDownload; override;
     function  HandleKmShell : Integer; override;
     procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
     function StateName: string; override;
@@ -141,10 +138,8 @@ type
     procedure Enter; override;
     procedure Exit; override;
     procedure HandleCheck; override;
-    procedure HandleDownload; override;
     function  HandleKmShell : Integer; override;
     procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
     function StateName: string; override;
@@ -155,10 +150,8 @@ type
     procedure Enter; override;
     procedure Exit; override;
     procedure HandleCheck; override;
-    procedure HandleDownload; override;
     function  HandleKmShell : Integer; override;
     procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
     function StateName: string; override;
@@ -181,10 +174,8 @@ type
     procedure Enter; override;
     procedure Exit; override;
     procedure HandleCheck; override;
-    procedure HandleDownload; override;
     function  HandleKmShell : Integer; override;
     procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
     function StateName: string; override;
@@ -195,44 +186,37 @@ type
     procedure Enter; override;
     procedure Exit; override;
     procedure HandleCheck; override;
-    procedure HandleDownload; override;
     function  HandleKmShell : Integer; override;
     procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
     function StateName: string; override;
   end;
 
   PostInstallState = class(TState)
+  private
+      procedure HandleMSIInstallComplete;
   public
     procedure Enter; override;
     procedure Exit; override;
     procedure HandleCheck; override;
-    procedure HandleDownload; override;
     function  HandleKmShell : Integer; override;
     procedure HandleInstall; override;
-    procedure HandleMSIInstallComplete; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
     function StateName: string; override;
   end;
 
+
   { This class also controls the state flow see  }
   TUpdateStateMachine = class
   private
     FForce: Boolean;
     FAuto: Boolean;
     FParams: TUpdateStateMachineParams;
-
     FErrorMessage: string;
-
     DownloadTempPath: string;
-
     FShowErrors: Boolean;
-
-
-
     FDownload: TUpdateStateMachineDownloadParams;
 
     CurrentState: TState;
@@ -250,7 +234,6 @@ type
     function ConvertEnumState(const TEnumState: TUpdateState): TStateClass;
 
     procedure ShutDown;
-
     {
       SavePackageUpgradesToDownloadTempPath saves any new package IDs to a
       single file in the download tempPath. This procedure saves the IDs of any
@@ -272,9 +255,7 @@ type
 
     procedure   HandleCheck;
     function    HandleKmShell : Integer;
-    procedure   HandleDownload;
     procedure   HandleInstall;
-    procedure   HandleMSIInstallComplete;
     procedure   HandleAbort;
     procedure   HandleInstallNow;
     function    CurrentStateName: string;
@@ -339,8 +320,6 @@ constructor TUpdateStateMachine.Create(AForce : Boolean);
 // var TSerailsedState : TUpdateState;  // TODO: Remove
 begin
   inherited Create;
-
-
   FShowErrors := True;
   FParams.Result := oucUnknown;
 
@@ -403,7 +382,6 @@ begin
     Application.Terminate;
 end;
 
-
 { TOnlineUpdateSharedData }
 
 constructor TOnlineUpdateSharedData.Create(AParams: TUpdateStateMachineParams);
@@ -417,31 +395,41 @@ begin
   Result := FParams;
 end;
 
-
 function TUpdateStateMachine.SetRegistryState(Update : TUpdateState): Boolean;
 var
   UpdateStr : string;
+  Registry: TRegistryErrorControlled;
 begin
-
   Result := False;
-  with TRegistryErrorControlled.Create do
+  Registry := TRegistryErrorControlled.Create;
+
   try
-    RootKey := HKEY_LOCAL_MACHINE;
+    Registry.RootKey := HKEY_CURRENT_USER;
     KL.Log('SetRegistryState State Entry');
-    if OpenKey(SRegKey_KeymanEngine_LM, True) then
+    if not Registry.OpenKey(SRegKey_KeymanEngine_LM, True) then
     begin
-        UpdateStr := GetEnumName(TypeInfo(TUpdateState), Ord(Update));
-        WriteString(SRegValue_Update_State, UpdateStr);
-        KL.Log('SetRegistryState State is:[' + UpdateStr + ']');
+      KL.Log('Failed to open registry key: ' + SRegKey_KeymanEngine_LM);
+      Exit;
     end;
-    Result := True;
+
+    try
+      UpdateStr := GetEnumName(TypeInfo(TUpdateState), Ord(Update));
+      Registry.WriteString(SRegValue_Update_State, UpdateStr);
+      KL.Log('SetRegistryState State is: [' + UpdateStr + ']');
+      Result := True;
+    except
+      on E: Exception do
+      begin
+        KL.Log('Failed to write to registry: ' + E.Message);
+      end;
+    end;
+
   finally
-      Free;
+    Registry.Free;
   end;
 
 end;
 
-
 function TUpdateStateMachine.CheckRegistryState : TUpdateState;  // I2329
 var
   UpdateState : TUpdateState;
@@ -452,7 +440,7 @@ begin
   // check the registry value
   with TRegistryErrorControlled.Create do  // I2890
   try
-    RootKey := HKEY_LOCAL_MACHINE;
+    RootKey := HKEY_CURRENT_USER;
     if OpenKeyReadOnly(SRegKey_KeymanEngine_LM) and ValueExists(SRegValue_Update_State) then
       begin
         UpdateState := TUpdateState(GetEnumValue(TypeInfo(TUpdateState), ReadString(SRegValue_Update_State)));
@@ -477,7 +465,7 @@ begin
   Result := False;
   with TRegistryErrorControlled.Create do
   try
-    RootKey := HKEY_LOCAL_MACHINE;
+    RootKey := HKEY_CURRENT_USER;
     KL.Log('SetRegistryState State Entry');
     if OpenKey(SRegKey_KeymanEngine_LM, True) then
     begin
@@ -503,7 +491,7 @@ begin
   // check the registry value
   with TRegistryErrorControlled.Create do  // I2890
   try
-    RootKey := HKEY_LOCAL_MACHINE;
+    RootKey := HKEY_CURRENT_USER;
     if OpenKeyReadOnly(SRegKey_KeymanEngine_LM) and ValueExists(SRegValue_Install_Mode) then
       begin
         InstallMode := StrToBool(ReadString(SRegValue_Install_Mode));
@@ -520,7 +508,6 @@ begin
   Result := InstallMode;
 end;
 
-
 function TUpdateStateMachine.CheckUpdateSchedule: Boolean;
 begin
   try
@@ -639,21 +626,11 @@ begin
   Result := CurrentState.HandleKmShell;
 end;
 
-procedure TUpdateStateMachine.HandleDownload;
-begin
-  CurrentState.HandleDownload;
-end;
-
 procedure TUpdateStateMachine.HandleInstall;
 begin
   CurrentState.HandleInstall;
 end;
 
-procedure TUpdateStateMachine.HandleMSIInstallComplete;
-begin
-  CurrentState.HandleMSIInstallComplete;
-end;
-
 procedure TUpdateStateMachine.HandleAbort;
 begin
   CurrentState.HandleAbort;
@@ -669,8 +646,6 @@ begin
   Result := CurrentState.StateName;
 end;
 
-
-
 { State Class Memebers }
 constructor TState.Create(Context: TUpdateStateMachine);
 begin
@@ -679,10 +654,11 @@ end;
 
 procedure TState.ChangeState(NewState: TStateClass);
 begin
+  KL.Log('TUpdateStateMachine.ChangeState old' + bucStateContext.CurrentStateName  );
   bucStateContext.State := NewState;
+  KL.Log('TUpdateStateMachine.ChangeState new' + bucStateContext.CurrentStateName  );
 end;
 
-
 { IdleState }
 
 procedure IdleState.Enter;
@@ -702,6 +678,11 @@ var
   Result : TRemoteUpdateCheckResult;
 begin
 
+  {##### For Testing only just advancing to downloading ####}
+  ChangeState(UpdateAvailableState);
+  {#### End of Testing ### };
+
+
 
   { Make a HTTP request out and see if updates are available for now do
     this all in the Idle HandleCheck message. But could be broken into an
@@ -710,33 +691,30 @@ begin
 
 
   // If handle check event force check
-  CheckForUpdates := TRemoteUpdateCheck.Create(True);
-  try
-     Result:= CheckForUpdates.Run;
-  finally
-    CheckForUpdates.Free;
-  end;
+  //CheckForUpdates := TRemoteUpdateCheck.Create(True);
+  //try
+ //    Result:= CheckForUpdates.Run;
+ // finally
+ //   CheckForUpdates.Free;
+ // end;
 
   { Response OK and Update is available }
-  if Result = wucSuccess then
-  begin
-    ChangeState(UpdateAvailableState);
-  end;
+ // if Result = wucSuccess then
+ // begin
+ //   ChangeState(UpdateAvailableState);
+ // end;
+
   // else staty in idle state
 end;
 
-procedure IdleState.HandleDownload;
-begin
-
-end;
-
 function IdleState.HandleKmShell;
 var
  CheckForUpdates: TRemoteUpdateCheck;
  UpdateCheckResult : TRemoteUpdateCheckResult;
-const CheckPeriod: Integer = 7; // Days between checking for updates
+//const CheckPeriod: Integer = 7; // Days between checking for updates
 begin
   // Check if auto updates enable and if scheduled time has expired
+  KL.Log('IdleState.HandleKmShell');
   if ConfigCheckContinue then
   begin
     CheckForUpdates := TRemoteUpdateCheck.Create(True);
@@ -759,11 +737,6 @@ begin
 
 end;
 
-procedure IdleState.HandleMSIInstallComplete;
-begin
-
-end;
-
 procedure IdleState.HandleAbort;
 begin
 
@@ -804,16 +777,11 @@ begin
 
 end;
 
-procedure UpdateAvailableState.HandleDownload;
-begin
-
-end;
-
 function UpdateAvailableState.HandleKmShell;
 begin
   if bucStateContext.FAuto then
   begin
-    ChangeState(DownloadingState);;
+    ChangeState(DownloadingState);
   end;
   Result := kmShellContinue;
 end;
@@ -823,11 +791,6 @@ begin
 
 end;
 
-procedure UpdateAvailableState.HandleMSIInstallComplete;
-begin
-
-end;
-
 procedure UpdateAvailableState.HandleAbort;
 begin
 
@@ -869,16 +832,14 @@ begin
 
 end;
 
-procedure DownloadingState.HandleDownload;
-var DownloadResult : Boolean;
-begin
-  // We are already downloading do nothing
-end;
-
 function DownloadingState.HandleKmShell;
 var DownloadResult : Boolean;
 begin
-  DownloadResult := DownloadUpdatesBackground;
+  {##  for testing log that we would download }
+  KL.Log('DownloadingState.HandleKmshell test code continue');
+  DownloadResult := True;
+  { End testing}
+  //DownloadResult := DownloadUpdatesBackground;
   // TODO check if keyman is running then send to Waiting Restart
   if DownloadResult then
   begin
@@ -906,11 +867,6 @@ begin
   ChangeState(InstallingState);
 end;
 
-procedure DownloadingState.HandleMSIInstallComplete;
-begin
-
-end;
-
 procedure DownloadingState.HandleAbort;
 begin
 end;
@@ -926,7 +882,6 @@ begin
   Result := 'DownloadingState';
 end;
 
-
 function DownloadingState.DownloadUpdatesBackground: Boolean;
 var
   DownloadBackGroundSavePath : String;
@@ -946,7 +901,6 @@ begin
 //    kmcom.Keyboards.Apply;
 //    kmcom.Packages.Refresh;
 //  end;
-
   finally
     DownloadUpdate.Free;
   end;
@@ -956,7 +910,8 @@ end;
 
 procedure WaitingRestartState.Enter;
 begin
-  // Enter DownloadingState
+  // Enter WaitingRestartState
+  KL.Log('WaitingRestartState.HandleKmShell Enter');
   bucStateContext.SetRegistryState(usWaitingRestart);
 end;
 
@@ -970,11 +925,6 @@ begin
 
 end;
 
-procedure WaitingRestartState.HandleDownload;
-begin
-
-end;
-
 function WaitingRestartState.HandleKmShell;
 var
   SavedPath : String;
@@ -985,7 +935,7 @@ begin
   if HasKeymanRun then
   begin
     KL.Log('WaitingRestartState.HandleKmShell Keyman Has Run');
-    Result := kmShellExit;
+    Result := kmShellContinue;
     // Exit; // Exit is not wokring for some reason.
     // this else is only here because the exit is not working.
   end
@@ -1017,11 +967,6 @@ begin
 
 end;
 
-procedure WaitingRestartState.HandleMSIInstallComplete;
-begin
-
-end;
-
 procedure WaitingRestartState.HandleAbort;
 begin
 
@@ -1032,7 +977,6 @@ begin
   bucStateContext.SetRegistryInstallMode(True);
   // Notify User to install
   ChangeState(InstallingState);
-
 end;
 
 function WaitingRestartState.StateName;
@@ -1042,7 +986,6 @@ begin
 end;
 
 { InstallingState }
-
 function InstallingState.DoInstallPackage(Package: TUpdateStateMachineParamsPackage): Boolean;
 var
   FPackage: IKeymanPackageFile2;
@@ -1137,7 +1080,7 @@ end;
 
 procedure InstallingState.Exit;
 begin
-  // Exit DownloadingState
+
 end;
 
 procedure InstallingState.HandleCheck;
@@ -1145,11 +1088,6 @@ begin
 
 end;
 
-procedure InstallingState.HandleDownload;
-begin
-
-end;
-
 function InstallingState.HandleKmShell;
 begin
   // Result = exit straight away as we are installing (MSI installer)
@@ -1163,11 +1101,6 @@ begin
 
 end;
 
-procedure InstallingState.HandleMSIInstallComplete;
-begin
-
-end;
-
 procedure InstallingState.HandleAbort;
 begin
   ChangeState(IdleState);
@@ -1180,7 +1113,6 @@ end;
 
 function InstallingState.StateName;
 begin
-
   Result := 'InstallingState';
 end;
 
@@ -1188,13 +1120,12 @@ end;
 
 procedure RetryState.Enter;
 begin
-  // Enter DownloadingState
   bucStateContext.SetRegistryState(usRetry);
 end;
 
 procedure RetryState.Exit;
 begin
-  // Exit DownloadingState
+
 end;
 
 procedure RetryState.HandleCheck;
@@ -1202,11 +1133,6 @@ begin
 
 end;
 
-procedure RetryState.HandleDownload;
-begin
-
-end;
-
 function RetryState.HandleKmShell;
 begin
   // #TODO: #10210 Implement retry
@@ -1218,11 +1144,6 @@ begin
 
 end;
 
-procedure RetryState.HandleMSIInstallComplete;
-begin
-
-end;
-
 procedure RetryState.HandleAbort;
 begin
 
@@ -1251,7 +1172,7 @@ end;
 
 procedure PostInstallState.Exit;
 begin
-  // Exit downloading state
+
 end;
 
 procedure PostInstallState.HandleCheck;
@@ -1259,11 +1180,6 @@ begin
   // Handle Check
 end;
 
-procedure PostInstallState.HandleDownload;
-begin
-  // Handle Download
-end;
-
 function PostInstallState.HandleKmShell;
 begin
   // TODO: #10210  have a counter if we get called in this state
@@ -1351,5 +1267,4 @@ begin
   end;
 end;
 
-
 end.
diff --git a/windows/src/engine/insthelper/Keyman.System.Install.EnginePostInstall.pas b/windows/src/engine/insthelper/Keyman.System.Install.EnginePostInstall.pas
index 77fe071786..4eea8adb59 100644
--- a/windows/src/engine/insthelper/Keyman.System.Install.EnginePostInstall.pas
+++ b/windows/src/engine/insthelper/Keyman.System.Install.EnginePostInstall.pas
@@ -37,7 +37,7 @@ begin
   Result := False;
   UpdateStr := 'usPostInstall';
     //KL.Log('SetBackgroundState State Entry');
-  if RegOpenKeyEx(HKEY_LOCAL_MACHINE, PChar(SRegKey_KeymanEngine_LM), 0, KEY_ALL_ACCESS, hk) = ERROR_SUCCESS then
+  if RegOpenKeyEx(HKEY_LOCAL_MACHINE, PChar(SRegKey_KeymanEngine_CU), 0, KEY_ALL_ACCESS, hk) = ERROR_SUCCESS then
   begin
     try
       if RegSetValueEx(hk, PChar(SRegValue_Update_State), 0, REG_SZ, PWideChar(UpdateStr), Length(UpdateStr) * SizeOf(Char)) = ERROR_SUCCESS then